summaryrefslogtreecommitdiff
path: root/merge_test.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2015-10-07 12:29:34 +0200
committerCarlos Martín Nieto <[email protected]>2015-10-07 12:29:34 +0200
commit43b39805bd50d7767dc0b489f7532ef473fe419c (patch)
treea3493bda45332b1bfc5c99417738159708bcb189 /merge_test.go
parent1c855246ca0cb3faf7d8a644b22355e0ef6856a1 (diff)
parentb1d97c1ebd3c66e7311c11c02575d66f41bab953 (diff)
Merge pull request #261 from jbranchaud/fix-readme-typo
Fix typo in README: manaager -> manager
Diffstat (limited to 'merge_test.go')
0 files changed, 0 insertions, 0 deletions