IvanaE 4520816740 Merge branch 'lBranch' ... # Conflicts: # OlympusServices/.idea/caches/build_file_checksums.ser # OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java # OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java		2018-11-07 11:39:08 -05:00
..
caches	Merge branch 'lBranch'	2018-11-07 11:39:08 -05:00
codeStyles	Added android project	2018-09-28 15:39:43 -04:00
assetWizardSettings.xml	trying some wild stuff	2018-11-01 12:49:40 -04:00
gradle.xml	Added android project	2018-09-28 15:39:43 -04:00
misc.xml	testing 123	2018-11-03 22:54:32 -04:00
runConfigurations.xml	Added android project	2018-09-28 15:39:43 -04:00
vcs.xml	Logic	2018-10-19 16:45:18 -04:00