resolve confilict

docs/AddUserAsset.py

@@ -7,11 +7,7 @@ import datetime
 
 sys.path.append('../')
 os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
-<<<<<<< HEAD
-django.setup()
-=======
 #django.setup()
->>>>>>> beta
 
 
 from juser.views import db_add_user, md5_crypt, CRYPTOR, db_add_group
@@ -103,11 +99,7 @@ def test_add_asset():
     bis_group_all = BisGroup.objects.all()
     dept_all = DEPT.objects.all()
     for i in range(1, 500):
-<<<<<<< HEAD
-        ip = '192.168.1.' + str(i)
-=======
         ip = '192.168.5.' + str(i)
->>>>>>> beta
         asset = Asset(ip=ip, port=22, login_type='L', idc=test_idc, is_active=True, comment='test')
         asset.save()
         asset.bis_group = [random.choice(bis_group_all) for i in range(2)]
@@ -136,15 +128,6 @@ def test_add_log():
 
 if __name__ == '__main__':
     #install()
-<<<<<<< HEAD
-    test_add_dept()
-    test_add_group()
-    test_add_user()
-    test_add_idc()
-    test_add_asset_group()
-    test_add_asset()
-    test_add_log()
-=======
     #test_add_dept()
     #test_add_group()
     #test_add_user()
@@ -152,7 +135,6 @@ if __name__ == '__main__':
     #test_add_asset_group()
     test_add_asset()
     #test_add_log()
->>>>>>> beta
 
 
 

docs/install.py

@@ -7,11 +7,7 @@ import datetime
 
 sys.path.append('../')
 os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
-<<<<<<< HEAD
-django.setup()
-=======
 #django.setup()
->>>>>>> beta
 
 
 from juser.views import db_add_user, md5_crypt, CRYPTOR, db_add_group

docs/require.txt

@@ -1,10 +0,0 @@
-pexpect==3.3
-sphinx-me==0.3
-django==1.6
-python-ldap==2.4.18
-paramiko==1.15.1
-pycrypto==2.6.1
-ecdsa>=0.11
-MySQL-python==1.2.5
-readline
-django-uuidfield