diff options
| author | Michael Shuler <michael@pbandjelly.org> | 2013-05-15 12:07:00 -0500 |
|---|---|---|
| committer | Michael Shuler <michael@pbandjelly.org> | 2013-05-15 12:07:00 -0500 |
| commit | fe0a739bd44f670ed181024d3daf97f202238eda (patch) | |
| tree | 87cd3b838b177894c8e21d1b8ad0887bbf8d2ac5 | |
| parent | 972193fbd4cf19033d23c9780f72dec1df4da6af (diff) | |
| download | ca-certificates-fe0a739bd44f670ed181024d3daf97f202238eda.tar.gz | |
Remove merge remnant..
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 505a3ea..0c2a933 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,6 @@ ca-certificates (20130508) UNRELEASED; urgency=low * Clean up man page (LP#: 850997). -- Michael Shuler <michael@pbandjelly.org> Wed, 15 May 2013 11:57:18 -0500 ->>>>>>> debian-experimental ca-certificates (20130119) unstable; urgency=low |