commit 9b48c601171c9ef7d5303b5c3e1983707a066d92
author jan kaufman <jan.kaufman@tcpcloud.eu> Wed Oct 07 14:16:06 2015 +0200
committer jan kaufman <jan.kaufman@tcpcloud.eu> Wed Oct 07 14:16:06 2015 +0200
tree 86d9000a737d3b960885478ce087fe301f896d44
parent 6b09b146a1e70c2d0f2a1df8d770faca88398f28
parent 28938a9b4e8129ec68bacffbf2f5b853e580cdbb

fixed typofix in pillar example

README.rst

diff --git a/README.rst b/README.rst
index 2e6b30d..90730cd 100644
--- a/README.rst
+++ b/README.rst
@@ -109,7 +109,7 @@
           es-json:
             engine: es-json
             message_matcher: TRUE
-            index = logfile-%{%Y.%m.%d}
+            index: logfile-%{%Y.%m.%d}
 
 Read more
 =========

debian/changelog

diff --git a/debian/changelog b/debian/changelog
index f0b0069..f828603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,8 @@
+<<<<<<< HEAD
+=======
 salt-formula-heka (0.2) trusty; urgency=medium
 
   * First public release
 
  -- Filip Pytloun <filip.pytloun@tcpcloud.eu>  Wed, 07 Oct 2015 14:02:32 +0200
 
-salt-formula-heka (0.1) trusty; urgency=medium
-
-  * Initial release
-
- -- Jan Kaufman <jan.kaufman@tcpcloud.eu>  Thu, 13 Aug 2015 23:23:41 +0200