Skip to content

Fix styleguide again#1063

Closed
msecret wants to merge 4 commits into
18f-pages-stagingfrom
fix-styleguide-again
Closed

Fix styleguide again#1063
msecret wants to merge 4 commits into
18f-pages-stagingfrom
fix-styleguide-again

Conversation

@msecret

@msecret msecret commented Mar 17, 2016

Copy link
Copy Markdown
Contributor

Fixed merge conflict from here:

#985

There are additional changes here to the dist files because in #1049 we didn't commit any changes to the compiled files.

@nickjs, you can either merge this PR in, or take this branch, merge it into your forked branch and merge that PR.

@nickjs

nickjs commented Apr 7, 2016

Copy link
Copy Markdown
Contributor

@msecret Sorry so does this branch include everything from #985 just rebased onto the refactor?

@msecret

msecret commented Apr 12, 2016

Copy link
Copy Markdown
Contributor Author

Yes @nickjs, it should.

Unfortunately, it now needs to be rebased again. I'll try and take a look at some point.

@juliasolorzano

Copy link
Copy Markdown

Moving to the backlog for now until it is rebased.

@rogeruiz

Copy link
Copy Markdown
Contributor

Closing this PR in favor of #1180 which will cherry-pick these commits.

@rogeruiz rogeruiz closed this May 23, 2016
@maya maya deleted the fix-styleguide-again branch May 28, 2016 18:12
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.

5 participants