diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-05-05 17:13:24 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-05-05 17:13:24 +0200 |
| commit | b4278cc96fa0184b4f522e2bcfe82bd8eba93595 (patch) | |
| tree | 59969ad6463918810ca264854615e8b2cfdf0bad /debian/apt.dirs | |
| parent | f3594b9de99745c84563bac3ef59a159e30d4cd8 (diff) | |
| parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/apt.dirs
debian/changelog
Diffstat (limited to 'debian/apt.dirs')
| -rw-r--r-- | debian/apt.dirs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/apt.dirs b/debian/apt.dirs index 1e8b057eb..ecbcdbc0a 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -16,4 +16,3 @@ var/lib/apt/periodic var/log/apt usr/share/apt usr/share/bug/apt -usr/share/bash-completion/completions/ |