shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Delete a merge conflict marker

Browse Source 
svn path=/dists/trunk/linux-2.6/; revision=19126
This commit is contained in:
Ben Hutchings
2012-06-11 04:47:30 +00:00
parent d4d5cf7274
commit 08e199bbde
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@@ -224,7 +224,6 @@ linux-2.6 (3.2.17-1) unstable; urgency=low
-- Ben Hutchings <ben@decadent.org.uk> Sat, 12 May 2012 15:29:09 +0100
>>>>>>> .merge-right.r19023
linux-2.6 (3.2.16-1) unstable; urgency=low
* New upstream stable update: