Skip to content

Checkpoint2.2#10

Open
scottsaniuk wants to merge 37 commits intomasterfrom
checkpoint2.2
Open

Checkpoint2.2#10
scottsaniuk wants to merge 37 commits intomasterfrom
checkpoint2.2

Conversation

@scottsaniuk
Copy link

No description provided.

chandermani and others added 30 commits November 4, 2015 22:28
Conflicts:
	trainer/src/components/workout-runner/workout-runner.ts
# Conflicts:
#	trainer/src/bootstrap.ts
#	trainer/src/components/app/app.ts
# Conflicts:
#	trainer/src/components/app/app.component.ts
# Conflicts:
#	trainer/README.md
# Conflicts:
#	trainer/README.md
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