encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 08:29:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolved conflicts after merge.

Browse Source
This commit is contained in:
Omer Katz 2013-01-25 12:02:34 +03:00
parent f4b9d45976
commit 3470aa8996
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development.txt
View File

@ -1,5 +1,2 @@
<<<<<<< HEAD
django-discover-runner>=0.2.2
=======
coverage coverage
>>>>>>> tests_refactoring django-discover-runner>=0.2.2