changed done in the core text
Merge branch 'master' of https://github.com/CuelogicTech/web-test
first commit
generating confilcts on master
Merge branch 'master' of https://github.com/CuelogicTech/web-test
Merge branch 'master' of https://github.com/CuelogicTech/web-test
merged confilcts
Merge branch 'master' of https://github.com/CuelogicTech/web-test
merged conflicts
Created new folder
Created new folder
pradip ala re
Nilesh Directory added
text changes
Merge branch 'master' of https://github.com/CuelogicTech/web-test into testing_branch
removing file