Samsung Tools

Merge ~mystic-mirage/samsung-tools/+git/mm:mm into samsung-tools:master

  1. Git
  2. lp:~mystic-mirage/samsung-tools/+git/mm
  3. mm
  4. Merge into master
Proposed by Horváth H. István
Status: Needs review
Proposed branch: ~mystic-mirage/samsung-tools/+git/mm:mm
Merge into: samsung-tools:master
Diff against target: 22 lines (+8/-0) (has conflicts)
1 file modified
debian/changelog (+8/-0)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
Fortunato Ventre Pending
Review via email: mp+401495@code.launchpad.net
To post a comment you must log in.

Unmerged commits

b1ab7a3... by Mystic-Mirage

Use plain versioning in debian/changelog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 4765450..620035f 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,4 @@
6+<<<<<<< debian/changelog
7 samsung-tools (2.3.3~ppa1~loms~bionic) bionic; urgency=medium
8
9 * Rebuild for Ubuntu 18.04
10@@ -9,6 +10,13 @@ samsung-tools (2.3.3~ppa1~loms~artful) artful; urgency=medium
11 * Fix localization issues
12
13 -- Fortunato Ventre <vorione@gmail.com> Sun, 31 Dec 2017 13:20:46 +0100
14+=======
15+samsung-tools (2.3.2-1) bionic; urgency=medium
16+
17+ * Use plain versioning in debian/changelog
18+
19+ -- Mystic-Mirage <mm@revo> Sat, 30 Dec 2017 21:36:31 +0200
20+>>>>>>> debian/changelog
21
22 samsung-tools (2.3.2~ppa1~loms~artful) artful; urgency=medium
23

Subscribers

People subscribed via source and target branches

to all changes: