Merge branch 'lBranch'

Browse source

# 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

...

This commit is contained in:

IvanaE 2018-11-07 11:39:08 -05:00

parent aa56f4d772 ef6446f05b

commit 4520816740

4 changed files with 32 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

OlympusServices/.idea/caches/build_file_checksums.ser generated

View file

Binary file not shown.