Merge conflicts resolved

ncs-jss · Sep 25, 2017 · 2bd97f3 · 2bd97f3
2 parents f0de726 + e68cc2d
commit 2bd97f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/notices/admin.py b/notices/admin.py
@@ -24,9 +24,7 @@ class NoticeAdmin(admin.ModelAdmin):
     fieldsets = (
         (None, {
             'classes': ('wide', 'extrapretty'),
-            'fields': ('faculty', 'category', 'title', 'description', 'file_attached', 'course_branch_year',
-                       'visible_for_student', 'visible_for_faculty', 'visible_for_hod',
-                       'visible_for_others', 'visible_for_management', ),
+            'fields': ('faculty', 'category', 'title', 'description', 'file_attached', 'course_branch_year', 'visible_for_student', 'visible_for_faculty', 'visible_for_hod', 'visible_for_others', 'visible_for_management', ),
         }),
     )
 

diff --git a/wifi/views.py b/wifi/views.py
@@ -1,4 +1,3 @@
-from django.shortcuts import render
 from .models import WifiDetail
 from profiles.models import StudentDetail, FacultyDetail
 from django.contrib.auth.models import User
@@ -10,6 +9,7 @@
 from django.utils.decorators import method_decorator
 from django.contrib import messages
 from django.http import HttpResponse
+from django.shortcuts import render
 from .forms import WifiForm
 
 import xlsxwriter