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

Fork: 0

nitta-lab-2019 / CosmosServer

Browse code Merge branches 'TestGroupsMember' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosServer into TestGroupsMember # Conflicts: # src/main/java/com/example/cosmos_serversb/models/Users.java COSMOS-462 COSMOS-469 COSMOS-478 CreateShopsRest CreateUsersHibernate RequesetUser chengeLogsProperty fixGetRequests getRequestsListByGid master yolp
commit 9d937258d80d76caa01613b35e255344805bd5e3 2 parents 63518b2 + 1bea062 n-kande authored on 9 Jul 2019

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/entities/User.java

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/models/Users.java

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/models/UsersMain.java

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/resources/UsersRest.java

Show line notes below