search

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 #49

Closed haroldfarmer closed 4 years ago

haroldfarmer commented 4 years ago

Stan added compare wrestler button and text field and the listview for that as well as alert boxes and modified the Model file to bring over wrestler information to the main file. Harold added the listview for the start as well as some alert boxes and changed the model file to bring information to the main. The additions make the GUI more functional and more user friendly. Previous pull request was from wrong branch.

mikeknows commented 4 years ago

Merge conflict

haroldfarmer commented 4 years ago

Stan and I fixed the conflicts which was we added something to the same line as another group, and we added a button to the same spot on the grid.

mikeknows commented 4 years ago

Another merge conflict after accepting PRs

haroldfarmer commented 4 years ago

Fixed the issues