add git notes

Conflicts:

	README

diff --git a/README b/README
index 7dabc7ec10a3a6519341391cbbccc0dd653392c1..5e497acc481aa6dff851897a0ae090cbde6ebec8 100644 (file)
--- 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,