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

Fixed syntax issues to get tests running again #4

Merged
merged 3 commits into from
Oct 14, 2014

Conversation

matt-west
Copy link
Contributor

Have a look through the diffs to see what changed.
It's mainly syntax tweaks, but I also fixed up your association.

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	db/schema.rb
donsalvadori added a commit that referenced this pull request Oct 14, 2014
Fixed syntax issues to get tests running again
@donsalvadori donsalvadori merged commit a1ee083 into donsalvadori:master Oct 14, 2014
@@ -44,8 +44,3 @@ gem 'turbolinks'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'spring', group: :development



Copy link
Owner

Choose a reason for hiding this comment

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

lots of aesthetic changes here. Did you really alter anything in my gem file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, my text editor just dropped the extra whitespace.

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.

2 participants