From f4a14336cb59580e0aa6ff0c9d6c357dcf614336 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Tue, 11 Sep 2012 14:33:08 +0200 Subject: [PATCH] add git notes Conflicts: README --- README | 6 ++++++ 1 file changed, 6 insertions(+) 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, -- 2.47.2