designproject-design-6/src/main/java/design/model, branch import-export Unnamed repository; edit this file 'description' to name the repository. Merge branch 'main' into import-export 2025-11-16T07:01:58+00:00 sowgro tpoke.ferrari@gmail.com 2025-11-16T07:01:58+00:00 969b8071dd799dfaed939e10bf77b8a1ad42f9dc # 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 
# 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
export almost working 2025-11-14T01:05:25+00:00 sowgro tpoke.ferrari@gmail.com 2025-11-14T01:05:25+00:00 9adc51f8d74577b5c4ae9c1f88341252f2c22939 






fix constructor
2025-11-13T13:22:39+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-13T13:22:39+00:00

43530df067b1132b944e9619bdf60b72264829ec












Merge remote-tracking branch 'origin/league-model'
2025-11-13T13:20:04+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-13T13:20:04+00:00

c1bf473e5c6735ae00c3fbfec0f9d16c421387db

# 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





# 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







Fix some serialization stuff
2025-11-12T17:55:12+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-12T17:55:12+00:00

9a0949d31a7a0e8c9c311b07e92852cff867cc66












working on XML formatting
2025-11-11T22:51:31+00:00

WillemDalton
willemhdalton@gmail.com

2025-11-11T22:51:31+00:00

7de856cbb656d8b5fa88fed62380a8d4611060a1












working with matches in league
2025-11-11T14:02:20+00:00

Jacob Shimp
jrs9538@g.rit.edu

2025-11-11T14:02:20+00:00

a0b662eccc6422348a1016dc71b8262eeeeee78f












progress on import/export
2025-11-11T13:50:31+00:00

WillemDalton
willemhdalton@gmail.com

2025-11-11T13:50:31+00:00

f7102fd39b266b3d31fe72448b5d64d139648dee












Added list of matches
2025-11-11T13:48:38+00:00

Jacob Shimp
jrs9538@g.rit.edu

2025-11-11T13:48:38+00:00

fcf058c1999e4d23fd9e79e021901dbb39095367












fix circular dependency
2025-11-10T20:29:14+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-10T20:29:14+00:00

05bf6a19f341e2b2cb2b107dea65660a08439a1c