From: Benjamin Auder <benjamin.auder@somewhere>
Date: Mon, 12 Feb 2018 19:09:15 +0000 (+0100)
Subject: after merge with remote
X-Git-Url: https://git.auder.net/variants/Cwda/%7B%7B%20asset%28%27mixstore/images/current/gitweb.css?a=commitdiff_plain;h=b06f8fe6700d326e5bfae39e01a6ec58c1f46680;p=erdiag.git

after merge with remote
---

b06f8fe6700d326e5bfae39e01a6ec58c1f46680
diff --cc parser.js
index 6d028fd,2919c56..d6cee80
--- a/parser.js
+++ b/parser.js
@@@ -184,8 -187,8 +187,13 @@@ class ErDiag
  					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 + ")",
++>>>>>>> 40b4a9d230d105a61e22bef0a63a6e8d515524e9
  				});
  			});
  		});