Closed manastaneja closed 7 years ago
@manastaneja pls resolve the conflicts bro please update and resolve the conflicts we can assist you if you are not able to resolve the conflicts we can't resolve them as github states it's too complex to fix.
@Abhi2424shek Please check your mail. I have some queries :)
Yikes my mail? @manastaneja pls wait.... next time pls don't mail just ping on slack.
As you requested closing this...
Hi, I would like to merge it but somebody already edited the file. Are you able to make the changes, so it can be merged?