Added function for adding single conflict to the server
Added function for adding single conflict to the server
Merge branch 'master' of https://github.com/sankalpk/UnitProject
Libraries can be modified in create.html, adding creates dom elements, library-related buttons in create not yet tested
Libraries can be modified in create.html, adding creates dom elements, library-related buttons in create not yet tested