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

Add yoti to project - relates to issue #2 #10

Merged
merged 3 commits into from
Feb 8, 2017
Merged

Conversation

RhodesPeter
Copy link
Member

@RhodesPeter RhodesPeter commented Feb 8, 2017

Integrate Yoti into project - relates to issue #2 and issue #11

@@ -25,4 +25,4 @@ server.register([Inert], (err) => { // We register extra modules like inert here
server.route(routes); // Plug the routes we imported earlier into the server
});

module.exports = server;
module.exports = server;
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks like whitespace that has been caught by an automatic linter. Ideally you wouldn't have this showing up as a change to your code in this pull request (since there's no actual change to this file).

Can I suggest that either both of you turn the automtic linting on, or both of you turn this off? Otherwise one person's automatic linting will catch things that the other person has missed 👍

@jsms90
Copy link
Contributor

jsms90 commented Feb 8, 2017

@RhodesPeter If this PR relates to issue 11, one or more of your commits should be referencing issue 11

@jsms90 jsms90 assigned RhodesPeter and unassigned jsms90 Feb 8, 2017
@Jwhiles Jwhiles merged commit 31c4cd0 into master Feb 8, 2017
@RhodesPeter RhodesPeter deleted the AddYotiToProject branch February 8, 2017 11:45
@jsms90
Copy link
Contributor

jsms90 commented Feb 8, 2017

@Jwhiles @RhodesPeter
Please don't merge your own PRs guys :)

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.

4 participants