snapshot.go: resolve conflicts

cdc/entry/schema/snapshot.go

@@ -109,27 +109,6 @@ func (s *Snapshot) FillSchemaName(job *timodel.Job) error {
 	return nil
 }
 
-<<<<<<< HEAD
-// GetSchemaVersion returns the schema version of the meta.
-func GetSchemaVersion(meta *timeta.Meta) (int64, error) {
-	// After we get the schema version at startTs, if the diff corresponding to that version does not exist,
-	// it means that the job is not committed yet, so we should subtract one from the version, i.e., version--.
-	version, err := meta.GetSchemaVersion()
-	if err != nil {
-		return 0, errors.Trace(err)
-	}
-	diff, err := meta.GetSchemaDiff(version)
-	if err != nil {
-		return 0, errors.Trace(err)
-	}
-	if diff == nil {
-		version--
-	}
-	return version, nil
-}
-
-=======
->>>>>>> c5b8800f8e (schemaStorage(ticdc): remove `schemaVersion` in `schemaStorage` (#11869))
 // NewSnapshotFromMeta creates a schema snapshot from meta.
 func NewSnapshotFromMeta(
 	id model.ChangeFeedID,