3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout...

[framework/uifw/elementary.git] / data / themes / widgets / naviframe.edc

diff --git a/data/themes/widgets/naviframe.edc b/data/themes/widgets/naviframe.edc
index a0753f1..71d2850 100644 (file)
--- a/data/themes/widgets/naviframe.edc
+++ b/data/themes/widgets/naviframe.edc
@@ -111,11 +111,7 @@ group { name:"elm/naviframe/item/basic/default";
          description { state: "default" 0.0;
             min: 40 40;
             max: 40 40;
-<<<<<<< HEAD
-           fixed: 1 1;
-=======
             fixed: 1 1;
->>>>>>> remotes/origin/upstream
             align: 1 0.5;
             rel1.to: "elm.text.title";
             rel1.relative: 0 0;