nitta-lab-2019:master
nitta-lab-2019:CreateUsersHibernate
# Conflicts: # src/main/java/com/example/cosmos_serversb/entities/User.java