summaryrefslogtreecommitdiffstats
path: root/server/lib/external-backends/backendhelper.js
diff options
context:
space:
mode:
authorJannik Schönartz2019-03-08 02:00:24 +0100
committerJannik Schönartz2019-03-08 02:00:24 +0100
commit8f40526c94f9230ee5f7f342923332bb1568312f (patch)
treeffde01e114fed2a51bc528ea6dd8372477c32ad9 /server/lib/external-backends/backendhelper.js
parent[server] New clients are automaticly added to the groups of the fitting subra... (diff)
downloadbas-8f40526c94f9230ee5f7f342923332bb1568312f.tar.gz
bas-8f40526c94f9230ee5f7f342923332bb1568312f.tar.xz
bas-8f40526c94f9230ee5f7f342923332bb1568312f.zip
[webapp] Add require symbol for the user / account forms
Diffstat (limited to 'server/lib/external-backends/backendhelper.js')
-rw-r--r--server/lib/external-backends/backendhelper.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/lib/external-backends/backendhelper.js b/server/lib/external-backends/backendhelper.js
index 752ccf7..ae1af3d 100644
--- a/server/lib/external-backends/backendhelper.js
+++ b/server/lib/external-backends/backendhelper.js
@@ -32,7 +32,7 @@ module.exports = {
if (client.parents) {
var elements = backend.mappedGroups.filter(x => client.parents.includes(x.id))
if (elements.length > 1) {
- // TODO ADD MERGE CONFLICT
+ // Conflict occured!
const conflict = await db.conflict.create({ description: 'Multiple parents found' })
// Add backend to the conflict.