Browse Source

remove conflict marker

tags/3.13
Joey Hess 9 years ago
parent
commit
de1e8e8888
1 changed files with 0 additions and 1 deletions
  1. +0
    -1
      debian/changelog

+ 0
- 1
debian/changelog View File

@@ -10,7 +10,6 @@ tasksel (3.13) UNRELEASED; urgency=low
and lxde do not. Closes: #655841

-- Joey Hess <joeyh@debian.org> Sat, 28 Jul 2012 12:20:32 -0400
>>>>>>> 2a962cc65cdba010177f27e8824ba10d9a799a08

tasksel (3.12) unstable; urgency=low



Loading…
Cancel
Save