torched_esc/ESPNTPServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove missed merge marker

Browse Source
This commit is contained in:
Christopher Liebman 2019-07-19 09:49:21 -07:00
parent 0d6f81e817
commit bdf571791f
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -2,7 +2,6 @@
GPS fueled ESP8266 based NTP Server 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) [![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 [src](src) Contains the code for the NTP Server