Skip to content
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

Jack rollback #38

Merged
merged 8 commits into from
Oct 18, 2017
Merged

Jack rollback #38

merged 8 commits into from
Oct 18, 2017

Conversation

gugakatsi
Copy link
Contributor

No description provided.

@gugakatsi
Copy link
Contributor Author

@Swati4star there are merge conflicts with FunFunacts module and old loginActivity , i'll fix it few hours probably.

@gugakatsi
Copy link
Contributor Author

i guess is should clsoe PR #14 , already included here , since i pushed to master early accidenly.

@Swati4star
Copy link
Member

I think you should squash these commits into a single one.
I will also review these, and merge it soon. 👍

@@ -194,6 +194,7 @@ private void getBuslist() {
.url(uri)
.build();
//Setup callback
//Setup callback
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

repeated line

@Swati4star Swati4star merged commit 2ca6b2b into project-travel-mate:master Oct 18, 2017
@Swati4star
Copy link
Member

Thanks 👍
I have merged it.
Fixes #24

This was referenced Oct 18, 2017
@ghost ghost mentioned this pull request Feb 16, 2019
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.

None yet

2 participants