Changes done to create a conflict
committing changes
Merge branch 'demoBranch' of https://github.com/CuelogicTech/web-test into demoBranch
generating conflicts
Merge branch 'master' of https://github.com/CuelogicTech/web-test into demoBranch
generating confilcts
committing changes
updating changes
pradip ala re
Nilesh Directory added
text changes
comitting hookup test file
new branch created
hook file changes
Merge branch 'test_develop', remote-tracking branch 'origin' into development
Merge branch 'development' of https://github.com/CuelogicTech/web-test into development