Skip to content

Corrected link to jhipster logo #8

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 1 commit into from
Nov 16, 2014

Conversation

atomfrede
Copy link
Contributor

JHipster has a new logo.

</ul>
</div>
</div>
</div>
<footer class="footer">
<div class="container">
<p>Brought to you by <br><a href="http://github.com/PascalPrecht"> <img width="40" height="40" src="https://secure.gravatar.com/avatar/b32bdb1fc9fdadeb45d7a1267fdd2fc4?s=40"> Pascal Precht</a> <a href="http://github.com/knalli"><img height="210" src="https://secure.gravatar.com/avatar/6c349ffd9793132e1d217f0de572e080?s=40" width="40" height="40"> Jan Philipp</a> <a href="http://github.com/DWand"><img height="40" width="40" src="https://secure.gravatar.com/avatar/2146036b95ee605ca39779b958cd54ce?s=40"> Max Prichinenko</a>
Copy link
Member

Choose a reason for hiding this comment

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

What is that change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have no idea. Just opened ìndex.html in atom editor, changed the url of the logo and there was this additional diff.

Edit: Looks like an additional space at the end of the line in my local git history.

@knalli
Copy link
Member

knalli commented Nov 16, 2014

Thank you.

Besides the questions I've already posted: You should make PRs from and against branch canary. In that special "non-sourcecode" situation I could handle this. Anyway, please rebase/squash all the stuff into one single commit.

@atomfrede
Copy link
Contributor Author

I can't squash my commits nicely as they are already pushed (or am i wrong?). Maybe just reject this PR and I'll create a new PR from a dedicated branch?

@knalli
Copy link
Member

knalli commented Nov 16, 2014

You have to push with --force. That's okay for PRs.

@atomfrede
Copy link
Contributor Author

Squashed and pushed with a lot of force :)

@knalli
Copy link
Member

knalli commented Nov 16, 2014

My comment about branch canary was wrong. Wrong repo. It's okay.

Last line is a removed space...

knalli added a commit that referenced this pull request Nov 16, 2014
Corrected link to jhipster logo
@knalli knalli merged commit 8013c6a into angular-translate:master Nov 16, 2014
@knalli
Copy link
Member

knalli commented Nov 16, 2014

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants