batuhan-basoglu/SEG2105-Olympus-Android-Application
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed some file inconsistencies

Browse source
This commit is contained in:
Batuhan Berk Başoğlu 2018-10-05 11:40:22 -04:00
commit bcfa204f44
13 changed files with 108 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
OlympusServices/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,4 +1,8 @@
<<<<<<< HEAD
#Fri Oct 05 11:36:36 EDT 2018
=======
#Fri Oct 05 10:21:14 EDT 2018
>>>>>>> refs/remotes/origin/master
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME