encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 00:19:53 +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:00:46 +03:00
parent 79fa5c9588
commit f4b9d45976
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development.txt
View File

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