search

kossiitkgp / kwoc-2018

Web app for Kharagpur Winter of Code, 2018
https://kwoc.kossiitkgp.org
MIT License
0 stars 0 forks source link

trying to resolve conflict #79

Closed anushkashukla closed 5 years ago

anushkashukla commented 5 years ago

created new branch to solve the conflict

xypnox commented 5 years ago

I have resolved the conflicts and merged it with the master branch.