Atlas48/scratch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

missed merge confilct corrected

Browse Source
This commit is contained in:
Steve Domino 2015-10-12 12:05:06 -06:00
parent 3047240dd0
commit fdc13448a7
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scribble.go
View File

@ -119,11 +119,7 @@ func (d *Driver) write(trans Transaction) error {
tmpPath := finalPath + "~" tmpPath := finalPath + "~"
// write marshaled data to a file, named by the resourceID // write marshaled data to a file, named by the resourceID
<<<<<<< Updated upstream if err := ioutil.WriteFile(tmpPath, b, 0644); err != nil {
if err := ioutil.WriteFile(tmpPath, b, 0666); err != nil {
=======
if err := ioutil.WriteFile(dir+"/"+trans.ResourceID, b, 0644); err != nil {
>>>>>>> Stashed changes
return err return err
} }