From 47bce85bfcaa1dbe844cd7b784eb8c4fd0f1058b Mon Sep 17 00:00:00 2001
From: 375585408 <angelswy163@163.com>
Date: Thu, 21 Apr 2016 17:44:12 +0800
Subject: [PATCH] a little 1.0

---
 .../adapter/base/BaseQuickAdapter.java        | 26 +------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
index 44e97a046..a15fd49ea 100755
--- a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
+++ b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
@@ -49,7 +49,6 @@ public abstract class BaseQuickAdapter<T> extends RecyclerView.Adapter<RecyclerV
     /**
      * Use with {@link #openLoadAnimation}
      */
-<<<<<<< HEAD
     public static final int SCALEIN = 1 << 2;
     /**
      * Use with {@link #openLoadAnimation}
@@ -63,21 +62,7 @@ public abstract class BaseQuickAdapter<T> extends RecyclerView.Adapter<RecyclerV
      * Use with {@link #openLoadAnimation}
      */
     public static final int SLIDEIN_RIGHT = 1 << 5;
-=======
-    public static final int SCALEIN = 0x00000010;
-    /**
-     * Use with {@link #openLoadAnimation}
-     */
-    public static final int SLIDEIN_BOTTOM = 0x00000011;
-    /**
-     * Use with {@link #openLoadAnimation}
-     */
-    public static final int SLIDEIN_LEFT = 0x00000100;
-    /**
-     * Use with {@link #openLoadAnimation}
-     */
-    public static final int SLIDEIN_RIGHT = 0x00000101;
->>>>>>> CymChad/master
+
 
 
     protected static final String TAG = BaseQuickAdapter.class.getSimpleName();
@@ -102,18 +87,9 @@ public abstract class BaseQuickAdapter<T> extends RecyclerView.Adapter<RecyclerV
     @AnimationType
     private BaseAnimation mCustomAnimation;
     private BaseAnimation mSelectAnimation = new AlphaInAnimation();
-
-
-<<<<<<< HEAD
     protected static final int HEADER_VIEW = 1 << 6;
     protected static final int LOADING_VIEW = 1 << 7;
     protected static final int FOOTER_VIEW = 1 << 8;
-=======
-    protected static final int HEADER_VIEW = 0x00000110;
-    protected static final int LOADING_VIEW = 0x00000111;
-    protected static final int FOOTER_VIEW = 0x00001000;
->>>>>>> CymChad/master
-
     private View mHeaderView;
     private View mFooterView;