Merge remote-tracking branch 'origin/dev-python/pytest-django'
authorW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:52:25 +0000 (11:52 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:52:25 +0000 (11:52 -0700)
Pull in this per-package branch with a subtree merge [1]:

  $ git merge -s ours --no-commit origin/dev-python/pytest-django
  $ git read-tree --prefix=dev-python/dev-python/pytest-django/ -u origin/dev-python/pytest-django
  $ git commit -v

so folks who aren't using a version of Layman that supports submodules
(currently everybody) can use this modular package.

[1]: https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html

1  2 
dev-python/pytest-django/pytest-django-9999.ebuild

index 0000000000000000000000000000000000000000,ab612ba826da527cdae16fb760af5535567b5b2c..ab612ba826da527cdae16fb760af5535567b5b2c
mode 000000,100644..100644
--- /dev/null