From: marshmellow42 <marshmellowrf@gmail.com>
Date: Wed, 7 Oct 2015 13:38:07 +0000 (-0400)
Subject: fix changelog conflict
X-Git-Tag: v2.3.0~22^2
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f1f1aceabab9e21e98a415c0db57b09931cc9c84?ds=inline

fix changelog conflict
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5ccc8f7..a489c981 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,12 +18,9 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Added `data hex2bin` and `data bin2hex` for command line conversion between binary and hexadecimal (holiman)
 
 ### Changed
-<<<<<<< HEAD
 - changed `lf config t <threshold>` to be 0 - 128 and will trigger on + or - threshold value (marshmellow) 
 - `hf iclass dump` cli options - can now dump AA1 and AA2 with different keys in one run (does not go to muliple pages for the larger tags yet)
-=======
 - Revised workflow for StandAloneMode14a (Craig Young)
->>>>>>> Proxmark/master
 - EPA functions (`hf epa`) now support both ISO 14443-A and 14443-B cards (frederikmoellers)
 - 'hw version' only talks to ARM at startup, after that the info is cached. (pwpiwi)