fix readme

669b8258 · icyrizard · 81ff42f4 · 669b8258
Commit 669b8258 authored Nov 24, 2014 by icyrizard
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

README.md README.md +0 -7

No files found.
--- a/README.md
+++ b/README.md
-<<<<<<< HEAD
-blackboard-extractor
-====================
-
-blackboard extractor - useful for grading assignments
-=======
 ## Extract assignments
 This bash script is created to extract files from blackboard. Blackboard has a
 horrible way of creating a zipfile. This tries to fix it.
->>>>>>> 50323c7... initial commit