From: W. Trevor King <wking@tremily.us>
Date: Tue, 7 Oct 2014 18:52:25 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/dev-python/pytest-django'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52d2e9a10dc0dfe85bf6adbf31f8a976a8a51415;p=wtk-overlay.git

Merge remote-tracking branch 'origin/dev-python/pytest-django'

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
---

52d2e9a10dc0dfe85bf6adbf31f8a976a8a51415
diff --cc dev-python/pytest-django/pytest-django-9999.ebuild
index 0000000,ab612ba..ab612ba
mode 000000,100644..100644
--- a/dev-python/pytest-django/pytest-django-9999.ebuild
+++ b/dev-python/pytest-django/pytest-django-9999.ebuild