Update sofia.db.js

adentes-org · Jun 27, 2016 · 2f3f884 · 2f3f884
1 parent e8cf67b
commit 2f3f884
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/www/assets/js/sofia.db.js b/www/assets/js/sofia.db.js
@@ -244,7 +244,8 @@ S.db.fiches = {
               type : "action",
               action : "autoMergeConflict",
               message : "Conflict detected locally and merged !",
-              diff : objectDiff.diff(o, ret),
+              /*  diff : objectDiff.diff(o, ret), */ //Take too much space
+              diff : objectDiff.diff(o.patient, ret.patient), //Let inclusive but show if important information has been changed
               timestamp : Date.now(),
               user :  S.user._current.name
     });