projects
/
erdiag.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forgot one conflict
[erdiag.git]
/
parser.js
diff --git
a/parser.js
b/parser.js
index
d6cee80
..
2919c56
100644
(file)
--- a/
parser.js
+++ b/
parser.js
@@
-187,13
+187,8
@@
class ErDiags
name: inh.parent + "_id",
type: this.tables[inh.parent][idx].type,
isKey: true,
name: inh.parent + "_id",
type: this.tables[inh.parent][idx].type,
isKey: true,
-<<<<<<< HEAD
- qualifiers: (this.tables[inh.parent][idx].qualifiers || "") + " foreign key references " + inh.parent,
- ref: inh.parent,
-=======
qualifiers: this.tables[inh.parent][idx].qualifiers || "",
ref: inh.parent + "(" + this.tables[inh.parent][idx].name + ")",
qualifiers: this.tables[inh.parent][idx].qualifiers || "",
ref: inh.parent + "(" + this.tables[inh.parent][idx].name + ")",
->>>>>>> 40b4a9d230d105a61e22bef0a63a6e8d515524e9
});
});
});
});
});
});