From fd6daaa73b7a6db07644b7804e848b817ae204f5 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Thu, 7 Jan 2016 15:21:10 -0700
Subject: [PATCH] 0.3.0: update README and documentation

---
 CONFIGURATION.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index ee79da98a..60a18e18b 100644
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -70,6 +70,10 @@ fields which begin with `time_`.
   precision = "s"
 
 # INPUTS
+<<<<<<< HEAD
+=======
+[inputs]
+>>>>>>> ac13af0... 0.3.0: update README and documentation
 [[inputs.cpu]]
   percpu = true
   totalcpu = false
@@ -80,6 +84,10 @@ fields which begin with `time_`.
 ### Input Config: tagpass and tagdrop
 
 ```toml
+<<<<<<< HEAD
+=======
+[inputs]
+>>>>>>> ac13af0... 0.3.0: update README and documentation
 [[inputs.cpu]]
   percpu = true
   totalcpu = false