# HG changeset patch # User casties # Date 1478025841 -3600 # Node ID 16cbff5deb09c07ad1d92ec0410d5d2742d29d2f # Parent e43d5179d47f548b2110af7215d9a00c10f271b3 nicer display of import merge. diff -r e43d5179d47f -r 16cbff5deb09 src/main/webapp/merge/importMerge.xhtml --- a/src/main/webapp/merge/importMerge.xhtml Mon Oct 31 18:32:15 2016 +0100 +++ b/src/main/webapp/merge/importMerge.xhtml Tue Nov 01 19:44:01 2016 +0100 @@ -90,6 +90,10 @@ + + + +