Merge remote-tracking branch 'remotes/origin/upstream'

[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 9ecc159..c80ba31 100644 (file)
--- a/src/bin/test_gesture_layer3.c
+++ b/src/bin/test_gesture_layer3.c
@@ -377,7 +377,11 @@ 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;