From d5d8b5e6b85e5b88980ca50b2067ec33c432cb13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Thu, 2 Feb 2017 22:30:35 +0100
Subject: test: update

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

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

diff --git a/test b/test
index 0a3fdd7..6fce999 160000
--- a/test
+++ b/test
@@ -1 +1 @@
-Subproject commit 0a3fdd77894a02c63cc14592505a4dbaaeaf7af7
+Subproject commit 6fce999e94d46c30e6c26ef31767279f813c90b5
-- 
cgit v1.2.3