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

New casters #20

Merged
merged 4 commits into from
Jun 21, 2015
Merged

New casters #20

merged 4 commits into from
Jun 21, 2015

Conversation

redmanatee
Copy link

Added in new casters - no idea where those other js files came from? Can I delete those?

Conflicts:
	app/js/controllers/recordController.js
	app/js/services/gameService.js
	app/partials/record.html
Conflicts:
	app/js/controllers/recordController.js
	app/js/services/gameService.js
	app/partials/record.html
@dbsmash
Copy link
Owner

dbsmash commented Jun 20, 2015

Yeah, those were old Angular JS files. You can remove.

@dbsmash
Copy link
Owner

dbsmash commented Jun 21, 2015

Looks good. Thanks man!

dbsmash added a commit that referenced this pull request Jun 21, 2015
@dbsmash dbsmash merged commit 7c04438 into dbsmash:master Jun 21, 2015
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.

None yet

3 participants