| commit | 41a907a448ea1a0f8dc7c57359373067167bfed9 | [log] [tgz] |
|---|---|---|
| author | Éric Lemoine <elemoine@mirantis.com> | Mon Nov 28 07:14:29 2016 +0000 |
| committer | Éric Lemoine <elemoine@mirantis.com> | Mon Nov 28 07:14:29 2016 +0000 |
| tree | 80b950c2fed111290694457c14bc6fa1c499e21c | |
| parent | 9b8180ad8db1274b594ab063d1d4f0fc97fa57e7 [diff] |
Revert "Stacklight (#71)" This reverts commit 4fdb8e9d0ba398dad4e663482d1ce31e94b1f585.
diff --git a/debian/changelog b/debian/changelog index b604c53..f828603 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,4 +1,5 @@ - +<<<<<<< HEAD +======= salt-formula-heka (0.2) trusty; urgency=medium * First public release