From: Tobias Oetiker <tobi@oetiker.ch>
Date: Tue, 11 Sep 2012 12:45:04 +0000 (+0200)
Subject: unbutcher the README -- learning to deal with branches
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c156a8d694e518aa152f9df2e018f5ad9c8e726;p=thirdparty%2Frrdtool-1.x.git

unbutcher the README -- learning to deal with branches
---

diff --git a/README b/README
index 5e497acc..2d83fae8 100644
--- a/README
+++ b/README
@@ -1,20 +1,9 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-Round Robin Database Tools
-==========================
-=======
-=======
->>>>>>> 5733836... add git notes
 RRDtool - Round Robin Database Tool
 ===================================
 
 RRDtool is a little program for easily maintaining a database of time-series
 data. It comes with a charting program for drawing pretty graphs based on
 the data stored.
-<<<<<<< HEAD
->>>>>>> 5733836... add git notes
-=======
->>>>>>> 5733836... add git notes
 
 It is pretty easy to gather status information from all sorts of things,
 ranging from the temperature in your office to the number of octets which