fixed plugin image size problem

[framework/uifw/elementary.git] / src / bin / test_gesture_layer3.c

diff --git a/src/bin/test_gesture_layer3.c b/src/bin/test_gesture_layer3.c
index c80ba31..780032e 100644 (file)
--- a/src/bin/test_gesture_layer3.c
+++ b/src/bin/test_gesture_layer3.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 #include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 /* We zoom out to this value so we'll be able to use map and have a nice
@@ -377,11 +377,7 @@ momentum_move(void *_po, void *event_info)
 {
    Photo_Object *po = (Photo_Object *) _po;
    Elm_Gesture_Momentum_Info *p = (Elm_Gesture_Momentum_Info *) event_info;
-<<<<<<< HEAD
-   printf("momentum move <%d,%d>\n", p->x2, p->y2);
-=======
    printf("momentum move <%d,%d> fingers=<%d> mx,my=<%d,%d>\n", p->x2, p->y2, p->n, p->mx, p->my);
->>>>>>> remotes/origin/upstream
 
    po->bx = p->x2 - po->dx;
    po->by = p->y2 - po->dy;