Merge branch 'master' of https://github.com/matryer/persist

Conflicts: README.md
keks · Feb 9, 2015 · c44222a · c44222a
2 parents a7d8bc4 + b6c66e6
commit c44222a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,6 +1,11 @@
+<<<<<<< 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
 
@@ -27,4 +32,4 @@ var conf Config
 if err := persist.Load("./project.conf", &conf); err != nil {
 	log.Fatalln("failed to load config:", err)
 }
-```
+```