From a89f6f1ff1a7a0d7c016b347f3340cb04f3c0bfc Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Tue, 11 Sep 2012 14:44:43 +0200 Subject: [PATCH] unbutcher the README -- learning to deal with branches --- README | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README b/README index 7dabc7ec..2d83fae8 100644 --- a/README +++ b/README @@ -1,14 +1,9 @@ -<<<<<<< HEAD -Round Robin Database Tools -========================== -======= 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. ->>>>>>> 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 -- 2.47.2