Skip to content
This repository was archived by the owner on Dec 1, 2021. It is now read-only.

Conversation

@serened
Copy link
Contributor

@serened serened commented Dec 11, 2012

No description provided.

serened and others added 25 commits October 13, 2012 12:54
Conflicts:
	week2/homework/questions.txt
	week2/homework/simon_says.rb
Merge github.com:serened/RubyFall2012

Conflicts:
	week3/homework/calculator.rb
	week3/homework/calculator_spec.rb
	week3/homework/questions.txt
Merge github.com:serened/midterm

Conflicts:
	.gitignore
	README.md
Merge git://github.com/UWE-Ruby/RubyFall2012

Conflicts:
	README.md
	mid_term/mid_term_spec.rb
Merge git://github.com/UWE-Ruby/RubyFall2012

Conflicts:
	mid_term/questions.txt
Merge git://github.com/UWE-Ruby/RubyFall2012

Conflicts:
	week7/class_materials/minitest/book.rb
	week7/exercises/features/step_definitions/converter.rb
	week7/exercises/features/step_definitions/converter_steps.rb
Merge git://github.com/UWE-Ruby/RubyFall2012

Conflicts:
	week7/homework/features/step_definitions/pirate.rb
	week7/homework/features/step_definitions/pirate_steps.rb
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant