Merge pull request #3387 from mmerickel/src-folder-refactor

Michael Merickel

2018-10-15 81576ee51564c49d5ff3c1c07f214f22a8438231

 tests/pkgs/conflictapp/__init__.py

File was renamed from pyramid/tests/pkgs/conflictapp/__init__.py
@@ -21,4 +21,4 @@
    config.set_authentication_policy(AuthTktAuthenticationPolicy(
        'seekri1t', hashalg='sha512'))
    config.set_authorization_policy(ACLAuthorizationPolicy())
    config.include('pyramid.tests.pkgs.conflictapp.included')
    config.include('tests.pkgs.conflictapp.included')