Merge branch 'master', remote-tracking branch 'origin'
Process Link Completion
Teacher View Of AssessmentResults
Merge branch 'master', remote-tracking branch 'origin'
request_new_book
Started Reports
added holidaycalendar and canteenmanagement
donation_of_book
conflict at holiday calendar
Merge remote-tracking branch 'origin/academic_assessment_results'
conflict on assesment merge
seed conflict resolution mestake solved