fix changelog conflict

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5ccc8f751a1c28176dd7382c64c2966b9a861c0..a489c981a6ed13f610a3bc918d0d83a845cb5328 100644 (file)
--- 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)