IvanaE d740cf72d3 Merge branch 'lBranch' ... # Conflicts: # OlympusServices/.idea/caches/build_file_checksums.ser # OlympusServices/.idea/vcs.xml # OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java # OlympusServices/app/src/main/res/layout/activity_main.xml # OlympusServices/app/src/main/res/layout/activity_sign_up.xml # OlympusServices/build.gradle		2018-10-19 19:02:28 -04:00
..
build_file_checksums.ser	Merge branch 'lBranch'	2018-10-19 19:02:28 -04:00