From: Tobias Oetiker <tobi@oetiker.ch>
Date: Tue, 11 Sep 2012 12:33:08 +0000 (+0200)
Subject: add git notes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a14336cb59580e0aa6ff0c9d6c357dcf614336;p=thirdparty%2Frrdtool-1.x.git

add git notes

Conflicts:

	README
---

diff --git a/README b/README
index 7dabc7ec..5e497acc 100644
--- a/README
+++ b/README
@@ -1,13 +1,19 @@
 <<<<<<< 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,