From ca86834bb9e1c4934436b1a672bbc18a381f0e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Sat, 19 Nov 2016 11:25:49 +0100
Subject: test: udpdate

---
 test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/sam/errors/conflict.in')

diff --git a/test b/test
index 8052572..7eefb7a 160000
--- a/test
+++ b/test
@@ -1 +1 @@
-Subproject commit 8052572a1721bc6a81f631b9738210a49473de53
+Subproject commit 7eefb7a5c6ee0ace52dbefaf91ec92f99b6887e7
-- 
cgit v1.2.3