Skip to content

Commit 4a2cee3

Browse files
author
The Bride
committed
Merge pull request deadlyvipers#11 from githubteacher/master
Githubteacher's contributions
2 parents c21c6b6 + 8a8ca9d commit 4a2cee3

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

another_feature.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Here's another feature

dojo_rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Dojo Rules
55
* Keep the dojo tidy
66
* Never bring live blades on the tatami
77
* Respect your opponents
8-
* Some Sensei's should be respected
8+
* Most Sensei's should be respected

0 commit comments

Comments
 (0)