ANIMATOR : Bug fix

This is build bug.

Change-Id: I36fb38efc2315fe35348ad6ca34f0ae249b24388
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java
index fd338ef..e54e4c8 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java
@@ -210,10 +210,6 @@ public class HoverViewerEditPart extends AbstractGraphicalEditPart implements IP
         if(e.getPart() instanceof AnimatorWidgetPart) {
                ((AnimatorWidgetPart) e.getPart()).widgetPropertyEdit();
         }
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
     }
 
     @Override