Skip to content

Corrected link to jhipster logo#8

Merged
knalli merged 1 commit intoangular-translate:masterfrom
atomfrede:master
Nov 16, 2014
Merged

Corrected link to jhipster logo#8
knalli merged 1 commit intoangular-translate:masterfrom
atomfrede:master

Conversation

@atomfrede
Copy link
Contributor

@atomfrede atomfrede commented Nov 16, 2014

JHipster has a new logo.

knalli
knalli reviewed Nov 16, 2014
View reviewed changes
index.html
Copy link
Member

@knalli knalli Nov 16, 2014

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

@atomfrede atomfrede Nov 16, 2014

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

atomfrede commented Nov 16, 2014

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

atomfrede commented Nov 16, 2014

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
@knalli
Merge pull request #8 from atomfrede/master
8013c6a 
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

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@atomfrede @knalli