missed merge confilct corrected

larschri · Oct 12, 2015 · fdc1344 · fdc1344
1 parent 3047240
commit fdc1344
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/scribble.go b/scribble.go
@@ -119,11 +119,7 @@ func (d *Driver) write(trans Transaction) error {
 	tmpPath := finalPath + "~"
 
 	// write marshaled data to a file, named by the resourceID
-<<<<<<< Updated upstream
-	if err := ioutil.WriteFile(tmpPath, b, 0666); err != nil {
-=======
-	if err := ioutil.WriteFile(dir+"/"+trans.ResourceID, b, 0644); err != nil {
->>>>>>> Stashed changes
+	if err := ioutil.WriteFile(tmpPath, b, 0644); err != nil {
 		return err
 	}