From 97ea228fb709dadbd86966ed8d5f032b90943ec6 Mon Sep 17 00:00:00 2001
From: gardners <paul@servalproject.org>
Date: Sun, 23 Mar 2014 16:55:04 +1030
Subject: [PATCH] remove LF added during conflict resolution.

---
 tests/test4502.bin | Bin 200 -> 199 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/test4502.bin b/tests/test4502.bin
index 617b1f722fa9a8c2af7a3983684c9ab455a2476f..ad317e79da03aa63f96cecbdfc503bc1425d52e5 100644
GIT binary patch
delta 6
NcmX@Xc${&<aR3Ry0_gw%

delta 8
PcmX@kc!F`laYilx51j(^