missed merge confilct corrected
This commit is contained in:
parent
3047240dd0
commit
fdc13448a7
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue