Skip to content

Tried to resolve conflicts #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 22, 2017
Merged

Tried to resolve conflicts #68

merged 3 commits into from
Nov 22, 2017

Conversation

Rijul1999
Copy link
Contributor

No description provided.

@prateekiiest
Copy link
Owner

great @Rijul1999
if you could resolve conflicts for .travis.yml also, then it will be good to go

@prateekiiest
Copy link
Owner

ok, I will do it for you

@prateekiiest prateekiiest merged commit ab01588 into prateekiiest:master Nov 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants