summaryrefslogtreecommitdiffstats
path: root/server/lib/external-backends/backendhelper.js
diff options
context:
space:
mode:
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.