[Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip...

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

diff --git a/data/themes/widgets/ctxpopup.edc b/data/themes/widgets/ctxpopup.edc
index 669997b..c07990c 100644 (file)
--- a/data/themes/widgets/ctxpopup.edc
+++ b/data/themes/widgets/ctxpopup.edc
@@ -424,10 +424,7 @@ group { name: "elm/ctxpopup/bg/default";
          source: "elm";
          action: STATE_SET "default" 0.0;
          target: "ctxpopup_bg";
-<<<<<<< HEAD
-=======
          transition: LINEAR 0.25;
->>>>>>> remotes/origin/upstream
       }
    }
 }
@@ -624,44 +621,26 @@ group { name: "elm/ctxpopup/base/default";
             rel1 { to:"base"; relative: 0 0; }
             rel2 { to:"base"; relative: 0 1; }
          }
-<<<<<<< HEAD
-         description { state: "up" 0.0;
-=======
          description { state: "show_up" 0.0;
->>>>>>> remotes/origin/upstream
             color: 255 255 255 0;
             rel1 { to:"arrow_area_down"; relative: 0 1; }
             rel2 { to:"arrow_area_down"; relative: 1 1; }
          }
-<<<<<<< HEAD
-         description { state: "left" 0.0;
-=======
          description { state: "show_left" 0.0;
->>>>>>> remotes/origin/upstream
             color: 255 255 255 0;
             rel1 { to:"arrow_area_right"; relative: 1 0; }
             rel2 { to:"arrow_area_right"; relative: 1 1; }
          }
-<<<<<<< HEAD
-         description { state: "right" 0.0;
-=======
          description { state: "show_right" 0.0;
->>>>>>> remotes/origin/upstream
             color: 255 255 255 0;
             rel1 { to:"arrow_area_left"; relative: 0 0; }
             rel2 { to:"arrow_area_left"; relative: 0 1; }
          }
-<<<<<<< HEAD
-         description { state: "down" 0.0;
-=======
          description { state: "show_down" 0.0;
->>>>>>> remotes/origin/upstream
             color: 255 255 255 0;
             rel1 { to:"arrow_area_up"; relative: 0 0; }
             rel2 { to:"arrow_area_up"; relative: 1 0; }
          }
-<<<<<<< HEAD
-=======
          description { state: "hide_up" 0.0;
             color: 255 255 255 255;
             rel1 { to:"arrow_area_down"; relative: 0 1; }
@@ -682,7 +661,6 @@ group { name: "elm/ctxpopup/base/default";
             rel1 { to:"arrow_area_up"; relative: 0 0; }
             rel2 { to:"arrow_area_up"; relative: 1 0; }
          }
->>>>>>> remotes/origin/upstream
          description { state: "visible" 0.0;
             color: 255 255 255 255;
             rel1 { to_x:"arrow_area_left"; to_y:"arrow_area_up"; }
@@ -698,36 +676,6 @@ group { name: "elm/ctxpopup/base/default";
          transition: LINEAR 0.25;
          target: "ctxpopup_clip";
       }
-<<<<<<< HEAD
-      program { name: "up";
-         signal: "elm,state,show,up";
-         source: "elm";
-         action: STATE_SET "up" 0.0;
-         transition: LINEAR 0.25;
-         target: "ctxpopup_clip";
-      }
-      program { name: "left";
-         signal: "elm,state,show,left";
-         source: "elm";
-         action: STATE_SET "left" 0.0;
-         transition: LINEAR 0.25;
-         target: "ctxpopup_clip";
-      }
-      program { name: "right";
-         signal: "elm,state,show,right";
-         source: "elm";
-         action: STATE_SET "right" 0.0;
-         transition: LINEAR 0.25;
-         target: "ctxpopup_clip";
-      }
-      program { name: "down";
-         signal: "elm,state,show,down";
-         source: "elm";
-         action: STATE_SET "down" 0.0;
-         transition: LINEAR 0.25;
-         target: "ctxpopup_clip";
-      }
-=======
       program { name: "show_up";
          signal: "elm,state,show,up";
          source: "elm";
@@ -792,7 +740,6 @@ group { name: "elm/ctxpopup/base/default";
          action: SIGNAL_EMIT "elm,action,hide,finished" "";
       }
 
->>>>>>> remotes/origin/upstream
    }
 }
 ///////////////////////////////////////////////////////////////////////////////