conflicts

aces · Oct 5, 2021 · e68b0e0 · e68b0e0
2 parents d731330 + 3c1f24c
commit e68b0e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 89 deletions.
diff --git a/SQL/0000-00-00-schema.sql b/SQL/0000-00-00-schema.sql
@@ -2441,3 +2441,7 @@ CREATE TABLE `publication_users_edit_perm_rel` (
 ) ENGINE=InnoDB DEFAULT CHARSET='utf8';
 
 
+) REFERENCES `users` (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET='utf8';
+
+
diff --git a/modules/configuration/js/diagnosis_evolution.js b/modules/configuration/js/diagnosis_evolution.js