<feed xmlns='http://www.w3.org/2005/Atom'>
<title>designproject-design-6/src/main/java, branch league-play-refactoring</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 'league-play-refactoring' of https://github.com/RIT-SWEN-262/designproject-design-6 into league-play-refactoring</title>
<updated>2025-11-16T21:02:38+00:00</updated>
<author>
<name>jrshi</name>
<email>jrs9538@g.rit.edu</email>
</author>
<published>2025-11-16T21:02:38+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=0b43e258054b450f5007ef4d4fa34dacba2d8a9c'/>
<id>0b43e258054b450f5007ef4d4fa34dacba2d8a9c</id>
<content type='text'>
Merging?
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Merging?
</pre>
</div>
</content>
</entry>
<entry>
<title>Removed team owner</title>
<updated>2025-11-16T21:01:15+00:00</updated>
<author>
<name>jrshi</name>
<email>jrs9538@g.rit.edu</email>
</author>
<published>2025-11-16T21:01:15+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=343d0baaaf718bfc9959484d187c4df1e171335e'/>
<id>343d0baaaf718bfc9959484d187c4df1e171335e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Cleaning up code</title>
<updated>2025-11-16T20:41:52+00:00</updated>
<author>
<name>jrshi</name>
<email>jrs9538@g.rit.edu</email>
</author>
<published>2025-11-16T20:41:52+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=c3ea697547950c2e3b48eafeb3a13275be73c5d2'/>
<id>c3ea697547950c2e3b48eafeb3a13275be73c5d2</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Working on league menus</title>
<updated>2025-11-16T20:37:32+00:00</updated>
<author>
<name>jrshi</name>
<email>jrs9538@g.rit.edu</email>
</author>
<published>2025-11-16T20:37:32+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=0c2644dcb4fb6e70fb0e9b7a4d583e8b5b9af021'/>
<id>0c2644dcb4fb6e70fb0e9b7a4d583e8b5b9af021</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fixed guests viewing courses</title>
<updated>2025-11-16T20:06:41+00:00</updated>
<author>
<name>WillemDalton</name>
<email>willemhdalton@gmail.com</email>
</author>
<published>2025-11-16T20:06:41+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=af9f559a2ee427905c39363643bac2e7878fb10c'/>
<id>af9f559a2ee427905c39363643bac2e7878fb10c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>complete merge</title>
<updated>2025-11-16T07:31:39+00:00</updated>
<author>
<name>sowgro</name>
<email>tpoke.ferrari@gmail.com</email>
</author>
<published>2025-11-16T07:31:39+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=552602cd1ccd351e9967a90a2e728ed0e4003beb'/>
<id>552602cd1ccd351e9967a90a2e728ed0e4003beb</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'main' into league-play-refactoring</title>
<updated>2025-11-16T07:22:34+00:00</updated>
<author>
<name>sowgro</name>
<email>tpoke.ferrari@gmail.com</email>
</author>
<published>2025-11-16T07:22:34+00:00</published>
<link rel='alternate' type='text/html' href='https://git.sowgro.net/designproject-design-6/commit/?id=2001073e2353e4e9824473cf712102cec3af6a11'/>
<id>2001073e2353e4e9824473cf712102cec3af6a11</id>
<content type='text'>
# Conflicts:
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/main/java/design/persistence/Serializers.java
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/main/java/design/persistence/Serializers.java
</pre>
</div>
</content>
</entry>
<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>
</feed>
