Skip to content

Commit

Permalink
Some updates and some corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
d3orn committed May 22, 2011
1 parent 0e85a45 commit 3f03fa2
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 2 deletions.
4 changes: 2 additions & 2 deletions 2011-accepted.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ To be admitted for the exam, you need to pass a5 and a5.2 (Ursuppe) and

a01 a02 a03 a04 a05 a06 a07 a5.2 a08 a09 a10
group03 ok ok wow ok ok ok -- ++ -- --
group04 ok ok ok ok ok ok -- ok ok --
group04 ok ok ok ok ok ok -- ok nef nef
group05 ok ok ok -- ok ok ok ok --
group06 ok ok ok nef ok ok nef ok ok --
group07 ok ok ok ok ok ok ok ok ok admitted
group08 ok ok ok ok ok ok -- nef ok --
group10 ok ok nef ok ok ok nef ok nef ++(20.5.)
group10 ok ok nef ok ok ok ok ok nef ++(20.5.)
group11 ok wow ok ok ok ok ok ++ -- --
group12 ok ok ok ok -- ok -- -- -- --
group13 ok wow ok wow wow ok ok wow ok admitted
Expand Down
56 changes: 56 additions & 0 deletions 2011-accepted.txt.orig
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Accepted.txt

This file contains the grades of the P2 students 2011

Please check your grades every week and inform us as soon as possible if
something is not correct.

-------------------------------------------------------------------------------

<<<<<<< HEAD
a01 a02 a03 a04 a05 a06 a07 a5.2 a08 a09
group02 ok nef -- -- -- -- -- -- --
group03 ok ok wow ok ok ok -- ++ ++
group04 ok ok ok ok ok ok -- nef --
group05 ok ok ok -- -- ok -- -- --
group06 ok ok ok nef ok ok nef nef ok
group07 ok ok ok ok ok ok ok ok nef
=======
a01 a02 a03 a04 a05 a06 a07 a5.2 a08 a09 a10
group03 ok ok wow ok ok ok -- ++ -- --
group04 ok ok ok ok ok ok -- nef --
group05 ok ok ok -- ok ok -- ok --
group06 ok ok ok nef ok ok nef ++ ok
group07 ok ok ok ok ok ok ok ok ok admitted
>>>>>>> d3b0a6f81c066332c479d957d3a1871edc543280
group08 ok ok ok ok ok ok -- nef ok
group10 ok ok nef ok ok ok nef ok --
group11 ok wow ok ok ok ok ok ++ --
group12 ok ok ok ok -- ok -- -- --
group13 ok wow ok wow wow ok ok wow --
<<<<<<< HEAD
group14 ok wow ok ok wow ok ok ++ --
group15 ok ok ok ok ok ok ok -- nef
group16 -- -- -- -- -- -- -- -- --
group17 ok nef -- -- -- -- -- -- --
group19 ok ok wow ok ok ok ok wow wow
group20 ok ok ok ok ok ok ok ok ++
group23 ok ok ok nef ok ok -- ok nef
=======
group14 ok wow ok ok wow ok ok ++ ++
group15 ok ok ok ok ok ok ok wow ok admitted
group19 ok ok wow ok ok ok ok wow ok admitted
group20 ok ok ok ok ok ok ok ok --
group23 ok ok ok nef ok ok -- ok ok
>>>>>>> d3b0a6f81c066332c479d957d3a1871edc543280
group24 fail nef ok nef nef -- -- -- --
group25 ok ok ok ok ok ok ok ok ok admitted

ok: accepted.
nef: revision required by next week.
fail: total failure.
--: nothing was submitted.
fix: fixed problemset.
++: deadline prolonged.
wow: Especially rad solution.
admitted: admitted to the exam.

0 comments on commit 3f03fa2

Please sign in to comment.