[Bf-blender-cvs] [ccbf6faed56] temp-vse-channels-edge-panning: Fix merge

[Richard Antalik]

Commit: ccbf6faed56e8655dfb9e3e6845743b44c5f190e
Author: Richard Antalik
Date:   Wed Mar 9 18:12:35 2022 +0100
Branches: temp-vse-channels-edge-panning
https://developer.blender.org/rBccbf6faed56e8655dfb9e3e6845743b44c5f190e

Fix merge

===================================================================

M	source/blender/blenloader/intern/versioning_300.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index f4a1f2d63d9..4a1105ccbda 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -2589,7 +2589,6 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
             continue;
           }
 
-<<<<<<< HEAD
           ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
                                                                  &sl->regionbase;
           ARegion *region = BKE_area_find_region_type(area, RGN_TYPE_CHANNELS);
@@ -2631,18 +2630,17 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
       ed->active_channels = &ms->parseq->channels;
     }
   }
-}
 
-/**
- * Versioning code until next subversion bump goes here.
- *
- * \note Be sure to check when bumping the version:
- * - "versioning_userdef.c", #blo_do_versions_userdef
- * - "versioning_userdef.c", #do_versions_theme
- *
- * \note Keep this message at the bottom of the function.
- */
-{
-  /* Keep this block, even when empty. */
-}
+  /**
+   * Versioning code until next subversion bump goes here.
+   *
+   * \note Be sure to check when bumping the version:
+   * - "versioning_userdef.c", #blo_do_versions_userdef
+   * - "versioning_userdef.c", #do_versions_theme
+   *
+   * \note Keep this message at the bottom of the function.
+   */
+  {
+    /* Keep this block, even when empty. */
+  }
 }