Merge "[copy&paste] add interface for OSP"

[framework/uifw/elementary.git] / src / lib / els_pan.c

diff --git a/src/lib/els_pan.c b/src/lib/els_pan.c
index ee0c960..4e02b3d 100644 (file)
--- a/src/lib/els_pan.c
+++ b/src/lib/els_pan.c
@@ -208,10 +208,7 @@ _smart_reconfigure(Smart_Data *sd)
         evas_object_move(sd->child_obj, sd->x - sd->px, sd->y - sd->py);
         sd->px = sd->delta_posx*sd->gravity_x;
         sd->py = sd->delta_posy*sd->gravity_y;
-<<<<<<< HEAD
-=======
 
->>>>>>> remotes/origin/upstream
      }
    else
      evas_object_move(sd->child_obj, sd->x - sd->px, sd->y - sd->py);