From fc8653eecc83c9821905df07169c97517471ca0c Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Thu, 23 May 2019 22:40:48 +0200
Subject: [PATCH] multi-merge failure

---
 .123trigger | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.123trigger b/.123trigger
index 7ed6ff82de..1e8b314962 100644
--- a/.123trigger
+++ b/.123trigger
@@ -1 +1 @@
-5
+6