From 4739e6f58df1116babac69896764e83db551f583 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 21 Apr 2019 20:26:01 -0400
Subject: Merge properties

---
 gradle.properties | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'gradle.properties')

diff --git a/gradle.properties b/gradle.properties
index c080daa0..4c0ace29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,11 +14,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 APP_ID=Frost
 APP_GROUP=com.pitchedapps
 
-<<<<<<< HEAD
-KAU=4.0.0-alpha02
-=======
 KAU=4.0.0
->>>>>>> dev
 KOTLIN=1.3.21
 
 # https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
@@ -60,13 +56,9 @@ MATERIAL_DRAWER_KT=2.0.1
 # https://github.com/square/okhttp/releases
 OKHTTP=3.14.0
 # http://robolectric.org/getting-started/
-<<<<<<< HEAD
-ROBOELECTRIC=4.1
 # https://developer.android.com/jetpack/androidx/releases/room
 ROOM=2.1.0-alpha04
-=======
 ROBOELECTRIC=4.2
->>>>>>> dev
 # https://github.com/davemorrissey/subsampling-scale-image-view#quick-start
 SCALE_IMAGE_VIEW=3.10.0
 # https://github.com/umano/AndroidSlidingUpPanel#importing-the-library
-- 
cgit v1.2.3