designproject-design-6 - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age
*	Merge branch 'main' into league-modelleague-model	sowgro	11 days
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/main/java/design/controller/userinput/menus/MainMenu.java # src/main/java/design/model/Golfer.java # src/main/java/design/model/ScrambleLeague.java # src/test/java/design/model/GolferTest.java # test.xml
\| *	finished unit testing for teams and matches	WillemDalton	13 days
\| \|
* \|	Merge branch 'main' into import-exportimport-export	sowgro	11 days
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # data/personaldb.json # src/main/java/design/controller/userinput/menus/MainMenu.java # src/main/java/design/persistence/JSONLeagueDatabase.java # src/main/java/design/persistence/JSONPersonalDatabase.java # src/test/java/design/model/ClubTest.java # src/test/java/design/model/GolferTest.java
\| *	Merge remote-tracking branch 'origin/league-model'	sowgro	2025-11-13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/main/java/design/controller/userinput/menus/MainMenu.java # src/main/java/design/model/Golfer.java # src/test/java/design/model/ClubTest.java # src/test/java/design/model/GolferTest.java
* \| \|	working on exporting to XML and JSON	WillemDalton	2025-11-10
\|\\| \| \| \|/ \|/\|
\| *	more unit tests	WillemDalton	2025-11-10
\| \|
* \|	make id system consistent	sowgro	2025-11-09
\|/
*	working on unit tests, added to pom to support jacoco	WillemDalton	2025-11-05