From 13de8619d98da5809110ba565b7acfd53e08cabf Mon Sep 17 00:00:00 2001
From: IvanaE <ebivibe@users.noreply.github.com>
Date: Wed, 10 Oct 2018 13:44:55 -0400
Subject: [PATCH] fixed merge conflict, when you pull check the right
 dependency is in your build.gradle file

---
 .../.idea/caches/build_file_checksums.ser       | Bin 537 -> 537 bytes
 OlympusServices/.idea/misc.xml                  |  10 +++-------
 OlympusServices/.idea/vcs.xml                   |   2 +-
 .../uottawa/olympus/olympusservices/SignUp.java |   2 +-
 OlympusServices/build.gradle                    |   9 ---------
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser
index 73af276a35eb0a7bf35435e70bcd09123bfbc0ed..f57e1c8f90e1c147bfb58cfcf91cb00580d55b14 100644
GIT binary patch
delta 77
zcmV-T0J8s?1epYom;_%7V%(9OcM#o_rM#m=DZW($^E3OZ0Kt=J0dgTB{&XT5K=U7(
jIQ~;;G$*cf04PH`Tvc;ra&ufsc42N|lQaP~lk5R4^?4r%

delta 84
zcmV-a0IUC*1epYom;^-M&&83PcOizadNdg`euA{o-(iW03F~wKC__42RdZ!>b6jF!
qbaiNxwgEPiB>`{~IKJU~%&XjTgkE>Fr0#8hbN~^PzX2PQ2m%o$lq1vt

diff --git a/OlympusServices/.idea/misc.xml b/OlympusServices/.idea/misc.xml
index b0c7b20..99202cc 100644
--- a/OlympusServices/.idea/misc.xml
+++ b/OlympusServices/.idea/misc.xml
@@ -5,31 +5,27 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="7">
+        <list size="5">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
           <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
-          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="6">
+        <list size="4">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/OlympusServices/.idea/vcs.xml b/OlympusServices/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/OlympusServices/.idea/vcs.xml
+++ b/OlympusServices/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
index 770795e..25c108c 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
@@ -11,7 +11,7 @@ public class SignUp extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sign_up);
         MaterialSpinner spinner = findViewById(R.id.RoleInput);
-        spinner.setItems("Ice Cream Sandwich", "Jelly Bean", "KitKat", "Lollipop", "Marshmallow");
+        spinner.setItems("Admin", "User", "Service Provider");
         spinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
 
             @Override public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
diff --git a/OlympusServices/build.gradle b/OlympusServices/build.gradle
index e21a03f..4e8009d 100644
--- a/OlympusServices/build.gradle
+++ b/OlympusServices/build.gradle
@@ -7,16 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-<<<<<<< HEAD
         classpath 'com.android.tools.build:gradle:3.2.0'
-=======
-<<<<<<< HEAD
-        classpath 'com.android.tools.build:gradle:3.2.0'
-=======
-        classpath 'com.android.tools.build:gradle:3.1.4'
-
->>>>>>> 0e3ca9a99ca712d5307384360c5dd5be9aeac57a
->>>>>>> refs/remotes/origin/master
         
 
         // NOTE: Do not place your application dependencies here; they belong