Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Small fixes to MANIFEST and setup

  • Loading branch information...
commit c9061390cc3eb88a244550b9aa43d7ee2c2ed29e 1 parent 59c17fa
@dangerfield dangerfield authored
Showing with 6 additions and 12 deletions.
  1. +1 −10 MANIFEST.in
  2. +5 −2 setup.py
View
11 MANIFEST.in
@@ -1,15 +1,6 @@
-<<<<<<< HEAD
-include LICENSE
-include README.md
-
-recursive-include form_designer/locale *
-recursive-include form_designer/media *
-recursive-include form_designer/templates *
-=======
include AUTHORS
include README.md
include LICENSE
recursive-include form_designer/templates *.html *.txt
-recursive-include form_designer/media *.js
+recursive-include form_designer/static *.js
recursive-include form_designer/locale *.po *.mo
->>>>>>> 29a8207f09ef53dba714edf377d444702106ad5c
View
7 setup.py
@@ -15,7 +15,7 @@ def read(fname):
description = "Design contact forms, search forms etc from the Django admin, without writing any code. Integrates with Django CMS.",
long_description = README,
- author = u'Samuel Lüscher',
+ author = 'Samuel Lüscher',
author_email = 'philomat@popkultur.net',
packages = [
'form_designer',
@@ -40,5 +40,8 @@ def read(fname):
'Operating System :: OS Independent',
'Programming Language :: Python',
'Topic :: Internet :: WWW/HTTP',
- ]
+ ],
+ install_requires = [
+ 'django-picklefield',
+ ],
)
Please sign in to comment.
Something went wrong with that request. Please try again.