Open sdavis00255 opened 4 years ago
Pull request #46 added layout.add(start, 0, 6); onto line 601 on src/wrestlingtournamentcli/Main.java which conflicts with layout.add(start, 0, 13); on line 592.
One of these will need to be removed.
I removed it, and it was from a different person that got merged into mine.
Pull request #46 added layout.add(start, 0, 6); onto line 601 on src/wrestlingtournamentcli/Main.java which conflicts with layout.add(start, 0, 13); on line 592.
One of these will need to be removed.