<feed xmlns='http://www.w3.org/2005/Atom'>
<title>designproject-design-6/src/main/java/design, branch main</title>
<subtitle>Unnamed repository; edit this file 'description' to name the repository.
</subtitle>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/'/>
<entry>
<title>Merge branch 'main' into league-model</title>
<updated>2025-11-16T07:15:49+00:00</updated>
<author>
<name>sowgro</name>
<email>tpoke.ferrari@gmail.com</email>
</author>
<published>2025-11-16T07:15:49+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=6ffc6b4cbd9e0c5ce2dc82a7c77f39b3adf849b6'/>
<id>6ffc6b4cbd9e0c5ce2dc82a7c77f39b3adf849b6</id>
<content type='text'>
# 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
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# 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
</pre>
</div>
</content>
</entry>
<entry>
<title>tweak main menu</title>
<updated>2025-11-16T07:12:47+00:00</updated>
<author>
<name>sowgro</name>
<email>tpoke.ferrari@gmail.com</email>
</author>
<published>2025-11-16T07:12:47+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=b5d46c7701716bcb2dd6127aeb97f8fcdb7774fc'/>
<id>b5d46c7701716bcb2dd6127aeb97f8fcdb7774fc</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #19 from RIT-SWEN-262/import-export</title>
<updated>2025-11-16T07:03:16+00:00</updated>
<author>
<name>Tyler Ferrari</name>
<email>69283684+Sowgro@users.noreply.github.com</email>
</author>
<published>2025-11-16T07:03:16+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=64dd072264dd59457cb195f23d17f03720b1cca0'/>
<id>64dd072264dd59457cb195f23d17f03720b1cca0</id>
<content type='text'>
Import export</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Import export</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'main' into import-export</title>
<updated>2025-11-16T07:01:58+00:00</updated>
<author>
<name>sowgro</name>
<email>tpoke.ferrari@gmail.com</email>
</author>
<published>2025-11-16T07:01:58+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=969b8071dd799dfaed939e10bf77b8a1ad42f9dc'/>
<id>969b8071dd799dfaed939e10bf77b8a1ad42f9dc</id>
<content type='text'>
# 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
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# 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
</pre>
</div>
</content>
</entry>
<entry>
<title>IMPORT-EXPORT WORKING!!!!!!!!!!!!!!!!!!!!!!!!!!</title>
<updated>2025-11-16T06:56:27+00:00</updated>
<author>
<name>sowgro</name>
<email>tpoke.ferrari@gmail.com</email>
</author>
<published>2025-11-16T06:56:27+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=cf59d52cba70742f1d4098c38b4c7a798b3d89fa'/>
<id>cf59d52cba70742f1d4098c38b4c7a798b3d89fa</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fix datetime issue</title>
<updated>2025-11-16T05:22:00+00:00</updated>
<author>
<name>sowgro</name>
<email>tpoke.ferrari@gmail.com</email>
</author>
<published>2025-11-16T05:22:00+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=4ac38e80c2442e085c53986f5717d44f9d2d821a'/>
<id>4ac38e80c2442e085c53986f5717d44f9d2d821a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fix nulls</title>
<updated>2025-11-16T04:27:40+00:00</updated>
<author>
<name>sowgro</name>
<email>tpoke.ferrari@gmail.com</email>
</author>
<published>2025-11-16T04:27:40+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=73cb1c77c99330360313bb07fcbc3c23a2516680'/>
<id>73cb1c77c99330360313bb07fcbc3c23a2516680</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>finished work on unit testing for npw</title>
<updated>2025-11-15T19:21:14+00:00</updated>
<author>
<name>WillemDalton</name>
<email>willemhdalton@gmail.com</email>
</author>
<published>2025-11-15T19:21:14+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=0c614ec078ea6d46b85d5032835cb98f9dc28c6c'/>
<id>0c614ec078ea6d46b85d5032835cb98f9dc28c6c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>progress on league database testing</title>
<updated>2025-11-14T18:36:42+00:00</updated>
<author>
<name>WillemDalton</name>
<email>willemhdalton@gmail.com</email>
</author>
<published>2025-11-14T18:36:42+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=c052f5cb104ff5d4599161cf5fad95545c3be957'/>
<id>c052f5cb104ff5d4599161cf5fad95545c3be957</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>finished testing most of JSON personal database</title>
<updated>2025-11-14T18:15:12+00:00</updated>
<author>
<name>WillemDalton</name>
<email>willemhdalton@gmail.com</email>
</author>
<published>2025-11-14T18:15:12+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=d2b35ee84843dc74afce87c3fb8b7e5a53cd56a7'/>
<id>d2b35ee84843dc74afce87c3fb8b7e5a53cd56a7</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
