SEG2105-Olympus-Android-App.../OlympusServices/gradle/wrapper/gradle-wrapper.properties

<<<<<<< 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
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
fixed some file inconsistencies 2018-10-05 11:40:22 -04:00			`<<<<<<< HEAD`
fixed some file inconsistencies 2018-10-05 11:39:30 -04:00			`#Fri Oct 05 11:36:36 EDT 2018`
fixed some file inconsistencies 2018-10-05 11:40:22 -04:00			`=======`
Made the UML Class Diagram 2018-10-05 11:20:01 -04:00			`#Fri Oct 05 10:21:14 EDT 2018`
fixed some file inconsistencies 2018-10-05 11:40:22 -04:00			`>>>>>>> refs/remotes/origin/master`
Added android project 2018-09-28 15:39:43 -04:00			`distributionBase=GRADLE_USER_HOME`
			`distributionPath=wrapper/dists`
			`zipStoreBase=GRADLE_USER_HOME`
			`zipStorePath=wrapper/dists`
fixed some file inconsistencies 2018-10-05 11:39:30 -04:00			`distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip`