Implemented three-way merge

[bbdiff.git] / Dev / Mod / Diff.odc

diff --git a/Dev/Mod/Diff.odc b/Dev/Mod/Diff.odc
index e12a6fdb60079a239a5906a25aaff3c9c9d8b0f4..aa95243369b5ff180723d90359cdde7ab261c78f 100644 (file)
Binary files a/Dev/Mod/Diff.odc and b/Dev/Mod/Diff.odc differ