diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-09-14 12:32:45 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-09-14 12:32:45 -0700 |
| commit | 5c645ec81a872116533ee6d3928b750d3737b68a (patch) | |
| tree | 52ad607246dccb3a786caa95ff5d4ea17309ac13 /tests/conditional_processing | |
| parent | 496b4d03314a96549d3e1f5c69d2d35bc4716906 (diff) | |
| parent | ff723d894d9272ea721d1996432ffc806c2b8180 (diff) | |
Merge branch 'master' of https://github.com/django/django
Diffstat (limited to 'tests/conditional_processing')
| -rw-r--r-- | tests/conditional_processing/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/conditional_processing/__init__.py b/tests/conditional_processing/__init__.py index 380474e035..e69de29bb2 100644 --- a/tests/conditional_processing/__init__.py +++ b/tests/conditional_processing/__init__.py @@ -1 +0,0 @@ -# -*- coding:utf-8 -*- |