From: Benjamin Auder <benjamin.auder@somewhere>
Date: Mon, 12 Feb 2018 19:10:25 +0000 (+0100)
Subject: Forgot one conflict
X-Git-Url: https://git.auder.net/doc/current/%7B%7B%20asset%28%27mixstore/css/common.css?a=commitdiff_plain;h=bc90ee3e67f85887da032580c84bfb8382fe6e1b;p=erdiag.git

Forgot one conflict
---

diff --git a/parser.js b/parser.js
index d6cee80..2919c56 100644
--- 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,
-<<<<<<< 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
 				});
 			});
 		});