| commit | 9b48c601171c9ef7d5303b5c3e1983707a066d92 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] | |
| parent | 28938a9b4e8129ec68bacffbf2f5b853e580cdbb [diff] [blame] |
fixed typofix in pillar example
diff --git a/debian/changelog b/debian/changelog index 3ed5139..f828603 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,5 +1,8 @@ -salt-formula-heka (0.1) trusty; urgency=medium +<<<<<<< HEAD +======= +salt-formula-heka (0.2) trusty; urgency=medium - * Initial release + * First public release - -- Jan Kaufman <jan.kaufman@tcpcloud.eu> Thu, 13 Aug 2015 23:23:41 +0200 + -- Filip Pytloun <filip.pytloun@tcpcloud.eu> Wed, 07 Oct 2015 14:02:32 +0200 +