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

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 RefactorAccountDelete # Conflicts: # src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java AccountManager FavoreitedRest FavoritedRest PublicBookManager RefactorAccountDelete Todo TodoManager Todomanager account2 accountRest changeAccountId favoritedRest favoritemanager favorites_rest2 master nitta-lab-2024-putTodo ppp putTodo scheduleManager scheduleManagerSakoda scheduleManagersakoda todoPut
commit 243c8dc55c5edb0be590f0c9b3f7e181d87ea5a4 2 parents de1827d + c053d44 h-yamamoto authored on 6 Jun

Browse code

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

AccountManager FavoreitedRest FavoritedRest PublicBookManager RefactorAccountDelete Todo TodoManager Todomanager account2 accountRest changeAccountId favoritedRest favoritemanager favorites_rest2 master nitta-lab-2024-putTodo ppp putTodo scheduleManager scheduleManagerSakoda scheduleManagersakoda todoPut

commit 243c8dc55c5edb0be590f0c9b3f7e181d87ea5a4

2 parents de1827d + c053d44

h-yamamoto authored on 6 Jun

Patch

Unified Split

Showing 11 changed files

Ignore Space Show notes View build.gradle

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

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/repositories/PublicBookManager.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/BooksRest.java

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

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

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

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

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

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

Show line notes below