[caja] branch ubuntu/artful updated (a7269b6 -> 1f24ec5)

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a change to branch ubuntu/artful
in repository caja.

      from  a7269b6   debian/changelog: Upload to ubuntu/1.18.2-0ubuntu1.
       new  e701787   debian/patches: Drop 0001_return_custom_icons.patch. Applied upstream.
       new  b06c58b   debian/patches: Drop 0000_do-not-show-property-browser-in-menu.patch. Obsolete.
       new  1f24ec5   resolve conflict

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                                   |  6 +++++
 ...0000_do-not-show-property-browser-in-menu.patch | 24 ------------------
 debian/patches/0001_return_custom_icons.patch      | 29 ----------------------
 debian/patches/series                              |  2 --
 4 files changed, 6 insertions(+), 55 deletions(-)
 delete mode 100644 debian/patches/0000_do-not-show-property-browser-in-menu.patch
 delete mode 100644 debian/patches/0001_return_custom_icons.patch
 delete mode 100644 debian/patches/series

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja.git