[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-7-ge378170

[Dan McGee]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The official pacman repository".

The branch, maint has been updated
       via  e378170c2555b656ef87715d8284d038037ced5f (commit)
       via  f8f4c2a6f301ab423f3ca702ebc24854cc701683 (commit)
      from  6eee3f6781b62f3a80697fbc7e3eeac0544e49e8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 lib/libalpm/conflict.c               |   48 ++++++++++++++++++++-------------
 test/pacman/tests/fileconflict008.py |   21 +++++++++++++++
 2 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 test/pacman/tests/fileconflict008.py


hooks/post-receive
-- 
The official pacman repository