| commit | c9a3eb1db5f39021fa71f13491943af576b02d0d | [log] [tgz] |
|---|---|---|
| author | Ales Komarek <ales.komarek@tcpcloud.eu> | Wed Oct 12 11:17:55 2016 +0200 |
| committer | Ales Komarek <ales.komarek@tcpcloud.eu> | Tue Oct 18 15:57:11 2016 +0200 |
| tree | 123c26008713d5ed62ff5261c54ce629f5d27ccd | |
| parent | 41a41d43c5cc5960ae0930c9332b62bc0446b77d [diff] [blame] |
Stacklight integration
diff --git a/debian/changelog b/debian/changelog index f828603..b604c53 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,5 +1,4 @@ -<<<<<<< HEAD -======= + salt-formula-heka (0.2) trusty; urgency=medium * First public release