fixes #257 - Githubissues

sarnava1 commented 5 years ago

[x] I have read the Contribution & Best practices Guide and my PR follows them.
[x] There is a corresponding issue for this pull request.
[x] My branch is up-to-date with the Upstream master branch.
[x] The unit tests pass locally with my changes (provide a screenshot or link for test)
[x] I have added tests that prove my fix is effective or that my feature works
[x] I have added necessary documentation (if appropriate)

Badgeyay, SUSI.AI for magic mirror and yaydoc added to FOSSASIA projects.

Fixes #257

xeon-zolt commented 5 years ago

@sarnava1 please fix merge conflicts

sarnava1 commented 5 years ago

@tabesin and @meets2tarun please review and merge this now.

tabesin commented 5 years ago

Needs to rebased. Does not apply cleanly.

sarnava1 commented 5 years ago

@tabesin I did not get you!!

tabesin commented 5 years ago

This has merge conflicts and undoes recent changes.

sarnava1 commented 5 years ago

@tabesin I am closing this and filing a new PR soon.

fossasia / meilix-generator