diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
| commit | 21248c0f00ee71412dbadc6ebf84011cf974346d (patch) | |
| tree | 7dc1f5904399482d2128765b5b86d57a4ac5b3e1 /debian/apt.dirs | |
| parent | e5f34ad3b043abf033c1626eb8449b75955d6760 (diff) | |
| parent | 4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (diff) | |
Merge branch 'debian/experimental' into feature/srv-records
Conflicts:
cmdline/apt-helper.cc
cmdline/makefile
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 e4bb2c824..6d492a30f 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -15,4 +15,3 @@ var/lib/apt/mirrors/partial var/lib/apt/periodic var/log/apt usr/share/bug/apt -usr/share/bash-completion/completions/
\ No newline at end of file |