[NUI] Fix mismatch issue of the enum CreateDPObject

diff --git a/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/Utility/EXamlOperationType.cs b/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/Utility/EXamlOperationType.cs
index 20b21b6..5c419dd 100755 (executable)
--- a/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/Utility/EXamlOperationType.cs
+++ b/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/Utility/EXamlOperationType.cs
@@ -30,7 +30,10 @@ namespace Tizen.NUI.EXaml
         GatherBindableProperty,
         CreateObject,
         CreateArrayObject,
+<<<<<<< Updated upstream
         CreateDPObject,
+=======
+>>>>>>> Stashed changes
         CreateDataTemplate,
         GetStaticObject,
         GetTypeObject,
@@ -48,6 +51,10 @@ namespace Tizen.NUI.EXaml
         AddToResourceDictionary,
         RegisterXName,
         GetLongString,
+<<<<<<< Updated upstream
+=======
+        CreateDPObject,
+>>>>>>> Stashed changes
         MAX
     }
 }

diff --git a/src/Tizen.NUI/src/internal/EXaml/Utility/EXamlOperationType.cs b/src/Tizen.NUI/src/internal/EXaml/Utility/EXamlOperationType.cs
index 0165666..4e5c598 100755 (executable)
--- a/src/Tizen.NUI/src/internal/EXaml/Utility/EXamlOperationType.cs
+++ b/src/Tizen.NUI/src/internal/EXaml/Utility/EXamlOperationType.cs
@@ -47,6 +47,7 @@ namespace Tizen.NUI.EXaml
         AddToResourceDictionary,
         RegisterXName,
         GetLongString,
+        CreateDPObject,
         MAX
     }
 }