Merge branches 'StoreLocationClass' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into StoreLocationClass

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
commit 52225e96d2de831ea38280a81b99ab7dbc85bbe4 2 parents e40b925 + b5fdf1e t-tai authored on 7 Nov 2019

Browse code

# Conflicts:
#	app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java

AchieveRequests RequestListActivity StoreLocationClass UpdateRequestList master searchNotificationsFix20191114 sendNotification updateAreaInformation

commit 52225e96d2de831ea38280a81b99ab7dbc85bbe4

2 parents e40b925 + b5fdf1e

t-tai authored on 7 Nov 2019

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/AreaInformation.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/CosmosLocation.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/Feature.java

Show notes View app/src/main/java/com/example/cosmosclient/entities/Location.java 100644 → 0

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/resources/LocationRest.java 0 → 100644

Show notes View app/src/main/java/com/example/cosmosclient/resources/ShopRest.java 100644 → 0

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java

Show line notes below