Fix conflicts: Map, Hover, Hoversel, Menu, Web

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

diff --git a/data/themes/widgets/map.edc b/data/themes/widgets/map.edc
index 13cff05..816aca8 100644 (file)
--- a/data/themes/widgets/map.edc
+++ b/data/themes/widgets/map.edc
@@ -742,7 +742,3 @@ group { name: "elm/map/marker_bubble/default";
       }
    }
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> remotes/origin/upstream