Update JJSearchView.java

android-cjj · Apr 7, 2016 · 49a4301 · 49a4301
1 parent 5aea085
commit 49a4301
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/library/src/main/java/com/cjj/sva/JJSearchView.java b/library/src/main/java/com/cjj/sva/JJSearchView.java
@@ -64,11 +64,7 @@ public void startAnim() {
 
     public void resetAnim() {
         if (mController != null)
-<<<<<<< HEAD
             mController.resetAnim();
-=======
-            mController.recetAnim();
->>>>>>> 3a19d94859686a9b6c03ccf7e8b879ae603e1ac8
     }
 
 }