Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusServer into BooksRest

Fork: 0

nitta-lab-2024 / CitrusServer

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusServer into BooksRest # Conflicts: # src/main/java/org/ntlab/citrusserver/resources/BooksRest.java AccountManager AccountRestSakoda AccountsRest BookManager/2 BooksRest FavoreitedRest FavoriteManager FavoriteRest FavoritedRest FavoritesRest IBookListener PublicBookManager PublicBooksRest Pubulic_etc RefactorAccountDelete ScheduleRest Todo TodoManager TodoRest Todomanager account2 accountRest accountRest2 accountentity changeAccountId favorite4 favorite_delete favorited2 favorited3 favoritedRest favoritemanager favorites favorites_rest2 fixBranch master nitta-lab-2024-putTodo ppp putTodo scheduleManager scheduleManagerSakoda scheduleManagersakoda todoPut
commit efa25c88d4c9692b97eb6f7540364c95aa5c3198 2 parents 123a30f + 73b9f70 d-matsuura authored on 7 May

Browse code

# Conflicts:
#	src/main/java/org/ntlab/citrusserver/resources/BooksRest.java

AccountManager AccountRestSakoda AccountsRest BookManager/2 BooksRest FavoreitedRest FavoriteManager FavoriteRest FavoritedRest FavoritesRest IBookListener PublicBookManager PublicBooksRest Pubulic_etc RefactorAccountDelete ScheduleRest Todo TodoManager TodoRest Todomanager account2 accountRest accountRest2 accountentity changeAccountId favorite4 favorite_delete favorited2 favorited3 favoritedRest favoritemanager favorites favorites_rest2 fixBranch master nitta-lab-2024-putTodo ppp putTodo scheduleManager scheduleManagerSakoda scheduleManagersakoda todoPut

commit efa25c88d4c9692b97eb6f7540364c95aa5c3198

2 parents 123a30f + 73b9f70

d-matsuura authored on 7 May

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/entities/Account.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/entities/Book.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/repositories/AccountManager.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/repositories/BookManager.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/resources/TodoRest.java

Show line notes below