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
Updated to the development
updating changes
Added a new folder with a sample html file in it
prashant_bugfix
from usermodule to bugfix
only for usermodule
Merge branch 'userbugfix' into usermodule
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
changes for demo