after merge with remote

diff --cc parser.js
index 6d028fd,2919c56..d6cee80
--- 1/parser.js
--- 2/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
                                });
                        });
                });