diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-07 19:26:05 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-07 19:26:05 -0400 |
| commit | bdcc8073f8fa0daa1413cdb5e5b6b4e8cc0c74f8 (patch) | |
| tree | dc3a581c3a36c21209b26fc03c82ff33d3bc176f /doc/sprint3.md | |
| parent | 4214112c7030fa695ff2d875b4b1888d5633a488 (diff) | |
| parent | ff03350cea6cb09b9a3aa408ac04acc8883227a4 (diff) | |
Fixed merge conflicts
Diffstat (limited to 'doc/sprint3.md')
| -rw-r--r-- | doc/sprint3.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/sprint3.md b/doc/sprint3.md index 67ec256..49ffb50 100644 --- a/doc/sprint3.md +++ b/doc/sprint3.md @@ -60,7 +60,7 @@ several days. +---------------------------------------------------------+------+------------+----+ | Task Description | Size | Person | US | +=========================================================+======+============+====+ -| Intelligent Error Handling (404 redirection) | 3 | Andrew | | +| Intelligent Error Handling (404 redirection) | 3 | Andrew | 2 | +---------------------------------------------------------+------+------------+----+ | Search | | | | +---------------------------------------------------------+------+------------+----+ @@ -68,13 +68,13 @@ several days. +---------------------------------------------------------+------+------------+----+ | Email verification | | | | +---------------------------------------------------------+------+------------+----+ -| Alternate Scoring and pairing methods | | Davis | | +| Alternate Scoring and pairing methods | | Davis | 4 | +---------------------------------------------------------+------+------------+----+ | Preferences | | | | +---------------------------------------------------------+------+------------+----+ | More types of seeded settings | | | | +---------------------------------------------------------+------+------------+----+ -| Asynchronous Riot Pulls | | Nathaniel | | +| Asynchronous Riot Pulls | | Nathaniel | 1 | +---------------------------------------------------------+------+------------+----+ | Brackets | | Tomer | | +---------------------------------------------------------+------+------------+----+ @@ -82,9 +82,9 @@ several days. +---------------------------------------------------------+------+------------+----+ | Make it look professional | | | | +---------------------------------------------------------+------+------------+----+ -| Expand Peer Evaluation | | G, A, D | | +| Expand Peer Evaluation | | G, A, D | 5 | +---------------------------------------------------------+------+------------+----+ -| Remote User IDs | | Davis | | +| Remote User IDs | | Davis | 1 | +---------------------------------------------------------+------+------------+----+ | Private Messages | | | | +---------------------------------------------------------+------+------------+----+ |