diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-10 20:55:35 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-10 20:55:35 -0400 |
| commit | 8f5359ec043e4f56ed74a99ba660c4b47fae057d (patch) | |
| tree | f911b01d5963a7d25a81143c6f701a90d114631a /doc | |
| parent | 1324ca83e5b1e4de83e93f1ba2e29066f0e86f72 (diff) | |
fix bad merge
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Sprint1-Retrospective.md | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/Sprint1-Retrospective.md b/doc/Sprint1-Retrospective.md index 8ff1c5b..3d15dff 100644 --- a/doc/Sprint1-Retrospective.md +++ b/doc/Sprint1-Retrospective.md @@ -109,15 +109,11 @@ designations (although for the demo some of the hooks were not in place, this has been fixed). ## Tournament settings {#tourney-settings} -<<<<<<< HEAD Tournament settings were implemented at a basic level, instituting those items which are similar to all tournaments, regardless of type, orginating from the game model. -======= - ->>>>>>> 5f96d780def7c33a6d6e452b558ac136ee4d06bc ## Tournament registration {#tourney-registration} Tournament registration and the tournament contoller were completed which @@ -177,7 +173,12 @@ only had it working where the tournament host would decide who won. ## Server management {#srv-man} - +The server management software interface is implemented, and working +fine. The other modules use it. However, what we didn't implement is +an actual *page* to edit these settings. We had this task in the +iteration because other items depended on it. Though we did not +implement the full story, we implemented the core reason that we +wanted it. # Not implemented |