diff options
| author | Felipe Sateler <fsateler@debian.org> | 2015-05-20 20:34:52 -0300 |
|---|---|---|
| committer | Felipe Sateler <fsateler@debian.org> | 2015-05-20 20:34:52 -0300 |
| commit | 1153ceb24ded4fee16940aa294891a254ffb7cca (patch) | |
| tree | 40ff906aeddb59b9c7e42f1c0329d5f5129e1c09 /debian/gbp.conf | |
| parent | 4596ec7aa8d5de52aeb48751f37f811059efd5da (diff) | |
| parent | 737a0782d207881d5edd4a3b20a674c73b87fc8c (diff) | |
Merge branch 'fig' into debian
Conflicts:
debian/changelog
debian/patches/series
Diffstat (limited to 'debian/gbp.conf')
| -rw-r--r-- | debian/gbp.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf index fc298b30..e26ca720 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,7 +1,5 @@ [DEFAULT] pristine-tar = True - -[buildpackage] debian-branch = debian [pq] |