fix readme

daviddias · daviddias · commit 2d6778c53840 · 2015-12-27T17:01:47.000+01:00
diff --git a/README.md b/README.md
@@ -326,12 +326,8 @@ ipfs.files.read(<path>, function (err, res) {
 ##### write
 
 ##### mv
-<<<<<<< b7595adb6e402164a28c2ec8193249182e62b592
+
 curl "http://localhost:5001/api/v0/files/mkdir?arg=%2Ffolder4"
->>>>>>> files api tests
-=======
 
 ```JavaScript
 ipfs.files.mv([<pathSrc>, <pathDst>], function (err) {})
-```
->>>>>>> add readme documentation for files
