These are the files
Merge branch 'master' of https://github.com/SudShekhar/Online-Examination-System
let's see
Revert "flag"

This reverts commit 66b8f7b3b8a312cb31d3295d17826d6ef405b24f.
Merge branch 'master' of https://github.com/SudShekhar/Online-Examination-System
commit before creating new branch
resolved
Merge branch 'master' into aman
Merge branch 'aman'
merged conflicts in result.php
final changes done