From 920a9427c812489109532a9addafbd5a33290684 Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 4 Mar 2016 08:27:36 -0500 Subject: [PATCH] bug test CONFLICT https://bugs.koha-community.org/show_bug.cgi?id=15976 --- misc/boop | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/boop b/misc/boop index e69de29..10b72a3 100644 --- a/misc/boop +++ b/misc/boop @@ -0,0 +1 @@ +CONFLICT -- 1.9.1