Fork: 0
nitta-lab-2019 / CosmosClient
Browse code
Merge branches 'StoreLocationClass' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into StoreLocationClass
# Conflicts:
#	app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java
AchieveRequests RequestListActivity StoreLocationClass UpdateRequestList master searchNotificationsFix20191114 sendNotification updateAreaInformation
1 parent 52225e9 commit 3d2c422d92c3bfb9b5df437e3f92fee4acc3b230
t-tai authored on 7 Nov 2019
Patch
Unified Split
Showing 1 changed file
View
app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java