diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2019-04-10 19:04:37 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2019-04-10 19:04:37 +0200 |
| commit | e1fec42e13a644a19d32621cbafedbbd8db22b5b (patch) | |
| tree | 34b1ddf1e07d94ce8b9a41a0017bfb89587aae81 /debian | |
| parent | cb7ae65f8e26320661b2b156462fda0fba09af77 (diff) | |
debian/changelog: Fix git automatic merge issue
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index c30e50b5f..f6eb3270a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ unity (7.5.0+19.04.20190103-0ubuntu1) disco; urgency=medium [ Marco Trevisan (Treviño) ] * debian/gbp.conf: add default settings to use gbp-buildpackage + * debian: use native source format [ Alberts Muktupāvels ] * Port to Python 3. (LP: #1310794) @@ -35,22 +36,11 @@ unity (7.5.0+19.04.20190103-0ubuntu1) disco; urgency=medium * Use std::get instead of std::tr1::get for std::tuple. * Build-depend on yaru-theme-icon to fix the test failure. - -- Dmitry Shachnev <mitya57@ubuntu.com> Thu, 03 Jan 2019 18:07:42 +0000 - -<<<<<<< -======= -unity (7.5.0+18.10.20180926.2-0ubuntu2) UNRELEASED; urgency=medium - - [ Marco Trevisan (Treviño) ] - * debian/gbp.conf: add default settings to use gbp-buildpackage - * debian: use native source format - [ Aleksey Tulinov ] * Add missing includes for build w/o pch - -- Marco Trevisan (Treviño) <marco@ubuntu.com> Sun, 04 Nov 2018 20:26:08 -0600 + -- Dmitry Shachnev <mitya57@ubuntu.com> Thu, 03 Jan 2019 18:07:42 +0000 ->>>>>>> unity (7.5.0+18.10.20180926.2-0ubuntu1) cosmic; urgency=medium [ Alexander Hale ] |