Fixed UML Diagram

2018-10-14 09:27:59 -04:00 · 2018-10-14 09:27:59 -04:00 · 68d18fb23f
commit 68d18fb23f
parent 12c3091a54
3 changed files with 0 additions and 4 deletions
--- a/OlympusServices/.idea/caches/build_file_checksums.ser
+++ b/OlympusServices/.idea/caches/build_file_checksums.ser
--- a/OlympusServices/build.gradle
+++ b/OlympusServices/build.gradle
@ -7,11 +7,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-<<<<<<< HEAD
        classpath 'com.android.tools.build:gradle:3.2.1'
-=======
-        classpath 'com.android.tools.build:gradle:3.2.0'
->>>>>>> 0b549796345e085e116f62068b5bac350c926e17
        

        // NOTE: Do not place your application dependencies here; they belong
--- a/Diagram.docx
+++ b/Diagram.docx