From 1bb76d2d22237498947ccde5d55bbeae05b5836e Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Mon, 5 Dec 2016 14:40:21 -0500
Subject: [PATCH] Resolve merge conflict for #1807

---
 CHANGE LOG 1.0.6.1.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt
index 98d70fcdc..4ade5be80 100644
--- a/CHANGE LOG 1.0.6.1.txt	
+++ b/CHANGE LOG 1.0.6.1.txt	
@@ -1,6 +1,7 @@
 [FIXED] Wrong texture for z_hunter zombie. #1805 @schwanzkopfhegel @ebayShopper
 [FIXED] Refuel with generator at gas station not working. #1806 @Helios27 @ebayShopper
 [FIXED] Issue where Arma cheats could still be entered under certain conditions without pressing LeftShift at the same time as NumPadMinus. @ebayShopper
+[FIXED] Tag friendly still showing after player accepts and related issue with BackpackAntiTheft. #1807 @oiad
 [FIXED] Undefined variable dayz_clientPreload error on main menu during intro.sqs. #1810 @ndavalos @ebayShopper
 
 [INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes.
\ No newline at end of file