From db0cccc25e7080688fb75cbde0886cd069cf1aa1 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 26 Apr 2020 21:22:06 +0200
Subject: [PATCH] doc

---
 doc/dev.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/dev.md b/doc/dev.md
index a58d8ed6..6763ba27 100644
--- a/doc/dev.md
+++ b/doc/dev.md
@@ -101,7 +101,6 @@ java.util.MissingResourceException and java.util.Properties to support
 2020/02/21
 Added java.time.temporal.ChronoUnit
 40651596 - 40598260 = 53kb added.
->>>>>>> master
 
 2020/02/19, e43727955a2cdabd2bb0189c20dd7f9a18156fc9
 Added fipp.edn/pprint