修复merge冲突

Author: goweii

anylayer/build.gradle

@@ -5,7 +5,6 @@ android {
 }
 
 dependencies {
-    compileOnly 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.github.goweii.VisualEffect:visualeffect-core:1.0.0'
     implementation 'com.github.goweii.VisualEffect:visualeffect-blur:1.0.0'
     implementation 'com.github.goweii.VisualEffect:visualeffect-view:1.0.0'

anylayer/src/main/java/per/goweii/anylayer/dialog/BackdropBlurView.java

@@ -4,11 +4,10 @@
 import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.RectF;
+import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 
-import androidx.annotation.NonNull;
-
 import java.util.Arrays;
 
 import per.goweii.visualeffect.blur.BlurEffect;