Update README.md

small edit
keks · Feb 20, 2015 · 3f28a51 · 3f28a51
1 parent c44222a
commit 3f28a51
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
-# persist
-
-Persist loads and saves Go objects to files.
-=======
 # persist [![GoDoc](https://godoc.org/github.com/matryer/persist?status.png)](http://godoc.org/github.com/matryer/persist)
 Persist loads and saves Go objects to files
->>>>>>> FETCH_HEAD
 
 ## Usage