Merge branch 'master' of C:\Users\Student\StudioProjects\CosmosClient with conflicts.

Fork: 0

nitta-lab-2019 / CosmosClient

Browse code Merge branch 'master' of C:\Users\Student\StudioProjects\CosmosClient with conflicts. AchieveRequests AddGroupByGroupID AddGroupByGroupID2 AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService DG_gitignore DisplayGroupIDToInvite DisplayGroupIDToInviteSecond DisplayTitleRep DisplaygID GPSgetInService GroupListActivity JouinGroupLayoutRepair LineInvite MemberList NotificationClass RequestList RequestListActivity SearchResultDisplay StoreLocationClass UpdateRequestList areaInfo master master_backup removeDGBuild searchNotificationsFix20191114 sendNotification ...updateAreaInformation
1 parent f18316e commit b5d6edf778690e42973cc4582d714011f94bdef7 k-morimoto authored on 30 May 2019

Browse code

AchieveRequests ...updateAreaInformation

1 parent f18316e commit b5d6edf778690e42973cc4582d714011f94bdef7

k-morimoto authored on 30 May 2019

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          gradle/wrapper/gradle-wrapper.properties
             #Tue May 28 15:35:44 JST 2019
#Thu May 23 16:30:34 JST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+#Tue May 28 15:35:44 JST 2019
+#Thu May 23 16:30:34 JST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

Show line notes below