before push
Merge branch 'master' of https://github.com/xavoctechnocratspvtltd/xschoolApp
Merge branch 'master' of https://github.com/xavoctechnocratspvtltd/xschoolApp
Merge branch 'master' of https://github.com/xavoctechnocratspvtltd/xschoolApp
Merge branch 'master' of https://github.com/xavoctechnocratspvtltd/xschoolApp
Merge branch 'master' of https://github.com/xavoctechnocratspvtltd/xschoolApp
Merge branch 'master' of https://github.com/xavoctechnocratspvtltd/xschoolApp
before push
before pull
before push
before pull
before pull
before pull
before pull
conflict resolved