diff options
| author | sowgro <tpoke.ferrari@gmail.com> | 2025-11-16 02:15:49 -0500 |
|---|---|---|
| committer | sowgro <tpoke.ferrari@gmail.com> | 2025-11-16 02:15:49 -0500 |
| commit | 6ffc6b4cbd9e0c5ce2dc82a7c77f39b3adf849b6 (patch) | |
| tree | 456ed56e629a6324e5993b7ce094705c72e0b922 /data | |
| parent | 64dd072264dd59457cb195f23d17f03720b1cca0 (diff) | |
| parent | b5d46c7701716bcb2dd6127aeb97f8fcdb7774fc (diff) | |
| download | designproject-design-6-league-model.tar.gz designproject-design-6-league-model.tar.bz2 designproject-design-6-league-model.zip | |
Merge branch 'main' into league-modelleague-model
# 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
Diffstat (limited to 'data')
| -rw-r--r-- | data/personaldb.json | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/data/personaldb.json b/data/personaldb.json index 9b9709d..3a08057 100644 --- a/data/personaldb.json +++ b/data/personaldb.json @@ -61,8 +61,8 @@ "clubUsed": 2 } ], - "swingCount": 3, - "distance": 106 + "distance": 106, + "swingCount": 3 }, { "holeNumber": 2, @@ -76,17 +76,17 @@ "clubUsed": 1 } ], - "swingCount": 2, - "distance": 1002 + "distance": 1002, + "swingCount": 2 } ], "currentHoleIndex": 2, - "totalSwings": 5, "totalDistance": 1108.0, "currentHole": { "number": 3, "par": 4 - } + }, + "totalSwings": 5 }, { "course": 1, @@ -112,20 +112,19 @@ "clubUsed": 1 } ], - "swingCount": 1, - "distance": 204 + "distance": 204, + "swingCount": 1 } ], "currentHoleIndex": 9, - "totalSwings": 1, "totalDistance": 204.0, "currentHole": { "number": 10, "par": 3 - } + }, + "totalSwings": 1 } - ], - "invites": [] + ] }, { "clubs": [], @@ -134,7 +133,6 @@ "passwordHash": 389416948, "fullName": "tyler f", "courses": [], - "rounds": [], - "invites": [] + "rounds": [] } ]
\ No newline at end of file |