Merge branch 'dev-python/pyvows'
authorW. Trevor King <wking@tremily.us>
Fri, 12 Aug 2016 21:32:54 +0000 (14:32 -0700)
committerW. Trevor King <wking@tremily.us>
Fri, 12 Aug 2016 21:32:54 +0000 (14:32 -0700)
* dev-python/pyvows:
  pyvows-9999.ebuild: Bump to EAPI 6 and git-r3

Conflicts:
dev-python/pyvows/pyvows-2.0.3.ebuild

The conflicts are due to the file addition/removal and thte local
dev-python/pyvows namespacing, and were resolved by removing
pyvows-2.0.3.ebuild and adding pyvows-2.1.0.ebuild.

1  2 
dev-python/pyvows/Manifest
dev-python/pyvows/pyvows-2.1.0.ebuild
dev-python/pyvows/pyvows-9999.ebuild

Simple merge
index 0000000000000000000000000000000000000000,26c68e8d08360126863370f963aaf5e57c2d9075..26c68e8d08360126863370f963aaf5e57c2d9075
mode 000000,120000..120000
--- /dev/null
Simple merge