[Bf-blender-cvs] [330d643d9ee] temp-vse-preview-transform: Fix unsaved change

[Richard Antalik]

Commit: 330d643d9ee39a60cd88a1cbe5e015be1e7fddec
Author: Richard Antalik
Date:   Sun Aug 29 21:16:57 2021 +0200
Branches: temp-vse-preview-transform
https://developer.blender.org/rB330d643d9ee39a60cd88a1cbe5e015be1e7fddec

Fix unsaved change

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

M	source/blender/editors/transform/transform.h

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

diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index f36bb124ac1..8d606a8a12e 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -94,13 +94,9 @@ typedef enum {
   /** When transforming object's, adjust the object data so it stays in the same place. */
   CTX_OBMODE_XFORM_OBDATA = (1 << 13),
   /** Transform object parents without moving their children. */
-<<<<<<< HEAD
-  CTX_OBMODE_XFORM_SKIP_CHILDREN = (1 << 13),
   /** Enable edge scrolling in 2D views */
   CTX_VIEW2D_EDGE_PAN = (1 << 14),
-=======
   CTX_OBMODE_XFORM_SKIP_CHILDREN = (1 << 14),
->>>>>>> VSE: Use transform operator in preview
 } eTContext;
 
 /** #TransInfo.flag */