Skip to content

Conversation

@octacode
Copy link
Contributor

Removed the hard coded string from the activity package to the match Template package in the java directory.

@opticod
Copy link
Collaborator

opticod commented Feb 10, 2017

@octacode, can you please resolve the conflict? #279

@octacode
Copy link
Contributor Author

@opticod Resolved Merge Conflicts. Please have a look.

} catch (ParserConfigurationException e) {
e.printStackTrace();

EditText authorEditText = (EditText) findViewById(R.id.author_name);
Copy link
Collaborator

Choose a reason for hiding this comment

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

@octacode
Why you make changes here?
Travis is failing, check the log here : https://travis-ci.org/BuildmLearn/BuildmLearn-Toolkit-Android/builds/211018551

@opticod
Copy link
Collaborator

opticod commented Sep 1, 2017

Are you still on this ? Will soon start reviewing and merging the PRs. Thanks.

@octacode
Copy link
Contributor Author

octacode commented Sep 1, 2017

Will send the PR soon 👍

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