github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-29 16:45:59 +00:00
Code Issues Projects Releases Wiki Activity

resolve confilict

Browse Source
This commit is contained in:
ibuler
2015-04-20 20:56:26 +08:00
parent 09d3763a02
commit e2ac212fc3
14 changed files with 0 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
log_handler.py
View File

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