From 5db6ffc03e59ed5f421870cbb7f3c1231c92d3de Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:14:57 +0100 Subject: [PATCH] fixed line endings --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7738596c17..c438889dcb 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,11 @@ Lampmaker, Bradley Feldman, and others... [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) [![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) +<<<<<<< HEAD What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 +======= +What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 +>>>>>>> fixed line endings ## Contact @@ -38,4 +42,3 @@ Marlin has a GPL license because I believe in open development. Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) -