gzdwsu / RaiderSMA

Murphy's Wrestling Tournament Manager. Design of Info Tech Sys. Secondary Project.
1 stars 17 forks source link

Harold Farmer and Stan Hostetler #29

Closed haroldfarmer closed 4 years ago

haroldfarmer commented 4 years ago

Added fixes to the Merge Problem. Also, I only committed and pushed the Main.java and Model.java. This should fix the issue of the .classpath file changing and stop the other files that were showing up.