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

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
commit 4520816740
4 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OlympusServices/app/build.gradle
View file

@ -24,7 +24,7 @@ android {
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'