From 4a24eb5934f1e973944798e609758bac01bf51f3 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 30 Jun 2016 07:57:15 +0100 Subject: [PATCH] Remove broken HEAD leftovers --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 6b3dcefd..bc16374a 100644 --- a/README.md +++ b/README.md @@ -253,8 +253,6 @@ A collective list of JSON APIs for use in web development. | Transport for Paris, France | RATP Open Data API | No | [Go!](http://data.ratp.fr/api/v1/console/datasets/1.0/search/) | | Transport for São Paulo, Brazil | SPTrans | Yes | [Go!](http://www.sptrans.com.br/desenvolvedores/APIOlhoVivo/Documentacao.aspx) | | Transport for The Netherlands | NS | No | [Go!](http://www.ns.nl/reisinformatie/ns-api) | -<<<<<<< HEAD -<<<<<<< HEAD | Transport for Sweden | Public Transport consumer | Yes | [Go!](https://www.trafiklab.se/api) | | Transport for Finland | Finnish transport API | No | [Go!](http://digitransit.fi/en/developers/) | | Schiphol Airport API | Schiphol | Yes | [Go!](https://flight-info.3scale.net/) @@ -294,4 +292,3 @@ A collective list of JSON APIs for use in web development. | OpenWeatherMap | Weather | No | [Go!](http://openweathermap.org/api) | | Yahoo! Weather | Weather | No | [Go!](https://developer.yahoo.com/weather/) | | Dark Sky Forecast API | Weather | No, but `apiKey` query string | [Go!](https://developer.forecast.io/) | -