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

Removes parade #2006

Merged
merged 1 commit into from
Jan 28, 2014
Merged

Removes parade #2006

merged 1 commit into from
Jan 28, 2014

Conversation

edisonout
Copy link
Member

Finally.

One day I will learn how to resolve conflicts like a big girl. But that day is not today.

@kyleconroy
Copy link
Member

👍

@bucketh3ad
Copy link
Member

Looks good

bucketh3ad added a commit that referenced this pull request Jan 28, 2014
@bucketh3ad bucketh3ad merged commit a1a372b into hawkthorne:master Jan 28, 2014
@edisonout edisonout deleted the parade-2 branch January 28, 2014 21:50
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.

3 participants