changed from Fatal to Error - copy paste mistake.

This commit is contained in:
Mark Beamer Jr 2018-09-07 20:51:50 -04:00
parent eea3d349a7
commit 29172e976b
No known key found for this signature in database
GPG key ID: 1C314FB89AD76973

View file

@ -100,7 +100,7 @@ func deleteOneToManyConflictsBeforeMerge(tx boil.Executor, conflict conflictingU
// used in the delete query.
colNames, err := rows.Columns()
if err != nil {
log.Fatal(err)
return errors.Err(err)
}
//Each row result of the query needs to be removed for being a conflicting row. Store each row's keys in an array.
var rowsToRemove = [][]interface{}(nil)