From bdf571791f5b7e1dddd9f427a186b739ce047ebb Mon Sep 17 00:00:00 2001 From: Christopher Liebman Date: Fri, 19 Jul 2019 09:49:21 -0700 Subject: [PATCH] remove missed merge marker --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index c106658..3d58788 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ GPS fueled ESP8266 based NTP Server -<<<<<<< HEAD [![Build Status](https://travis-ci.org/liebman/ESPNTPServer.svg?branch=master)](https://travis-ci.org/liebman/ESPNTPServer.svg) [src](src) Contains the code for the NTP Server