Removed .orig files

2017-06-20 23:41:53 +03:00 · 2017-06-20 23:41:53 +03:00 · 9ad0828eb2
parent 33a5c493f0
commit 9ad0828eb2
2 changed files with 0 additions and 22 deletions
--- a/gradle/wrapper/gradle-wrapper.properties.orig
+++ b/gradle/wrapper/gradle-wrapper.properties.orig
@ -1,11 +0,0 @@
-<<<<<<< HEAD
-#Sun Mar 20 15:13:00 IST 2016
-=======
-#Tue Aug 05 03:26:05 IDT 2014
->>>>>>> e8e511d9ce636a127bb33d70ebfd9b2f230c6e1d
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
-distributionSha256Sum=4647967f8de78d6d6d8093cdac50f368f8c2b8038f41a5afe1c3bce4c69219a9
--- a/settings.gradle.orig
+++ b/settings.gradle.orig
@ -1,11 +0,0 @@
-include 'meerkat-common'
-include 'voting-booth'
-include 'bulletin-board-server'
-include 'polling-station'
-include 'restful-api-common'
-<<<<<<< HEAD
-include 'mixer'
-=======
-include 'bulletin-board-client'
-
->>>>>>> e8e511d9ce636a127bb33d70ebfd9b2f230c6e1d