From 1c156a8d694e518aa152f9df2e018f5ad9c8e726 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Tue, 11 Sep 2012 14:45:04 +0200 Subject: [PATCH] unbutcher the README -- learning to deal with branches --- README | 11 ----------- 1 file changed, 11 deletions(-) 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 -- 2.47.2