fix conflict

felixzhou · felixzhou · commit 43b43ff5f8ff · 2019-01-02T10:57:01.000+08:00
diff --git a/samples/sample-android/gradle.properties b/samples/sample-android/gradle.properties
@@ -13,8 +13,6 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Wed Jun 28 12:25:50 AWST 2017
-<<<<<<< HEAD
-MATRIX_VERSION=0.4.8
-=======
+
 MATRIX_VERSION=0.4.10
->>>>>>> version code update to 0.4.10
+
