fix a bug

This commit is contained in:
ibuler
2015-04-20 20:54:10 +08:00
12 changed files with 231 additions and 0 deletions

View File

@@ -10,7 +10,11 @@ from datetime import datetime
os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
import django
<<<<<<< HEAD
django.setup()
=======
#django.setup()
>>>>>>> beta
from jlog.models import Log