From a3fd4d5fbb0c8f64268ec32543ee4115f4fc2083 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Fri, 17 Aug 2018 15:13:17 +0530
Subject: [PATCH] EXAM ATTEN ISSUE FIXED

---
 Apollo/assets/views/hallticket/examAttendancePDF.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Apollo/assets/views/hallticket/examAttendancePDF.html b/Apollo/assets/views/hallticket/examAttendancePDF.html
index 34e1235d..5817053e 100644
--- a/Apollo/assets/views/hallticket/examAttendancePDF.html
+++ b/Apollo/assets/views/hallticket/examAttendancePDF.html
@@ -31,11 +31,10 @@
 		
 		<div id="student_list_AM">
 		<table width="100%" border="1" id = "attendanceTableAM" style="background-color:#fff;" ng-if="studentInfoAM_Length != 0">
-<<<<<<< HEAD
-				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGNATURE</th> </tr></thead>
-=======
-				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGN</th> </tr></thead>
->>>>>>> 145988e7a66409e847e30051cbe103b3fdcfb907
+
+
+				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STU SIGN</th> </tr></thead>
+
 				<tbody>
 					<tr ng-repeat="student in dataForExamAttendanceAM" >
 					<td>{{($index+1)}}</td> <td>{{student.Firstname}} {{student.Lastname}} </td><td>{{student.CourseName}}</td><td>{{student.Sem_Year}}</td><td>{{student.EnrollmentID}}</td><td>{{student.SubjectCode}}</td><td>{{student.SubjectName}}</td><td></td><td></td>
@@ -47,7 +46,7 @@
 		
 		<div id="student_list_PM">
 		<table width="100%" border="1" id = "attendanceTablePM" style="background-color:#fff;" ng-if="studentInfoPM_Length != 0">
-				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGN</th> </tr></thead>
+				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STU SIGN</th> </tr></thead>
 				<tbody>
 					<tr ng-repeat="student in dataForExamAttendancePM" >
 					<td>{{($index+1)}}</td> <td>{{student.Firstname}} {{student.Lastname}} </td><td>{{student.CourseName}}</td><td>{{student.Sem_Year}}</td><td>{{student.EnrollmentID}}</td><td>{{student.SubjectCode}}</td><td>{{student.SubjectName}}</td><td></td><td></td>