summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-04-27 23:45:07 -0400
committerDavisLWebb <davislwebb@ymail.com>2014-04-27 23:45:07 -0400
commit7a3fe845d568f6eab1e7a55239daed3685797c2e (patch)
tree18f84996ddf5c02af9d7fc1c829d85d6c62a2f18 /lib
parentd38f6fa6262803f3c6380a43f32de4889fcacaec (diff)
parent1c37ae521e29a5e0869aba52d324ed0cd4a830a6 (diff)
Merge branch 'master' of https://github.com/LukeShu/Leaguer
Conflicts: app/views/tournaments/_form.html.erb
Diffstat (limited to 'lib')
-rw-r--r--lib/sampling/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sampling/README.md b/lib/sampling/README.md
index bde84cd..3d564da 100644
--- a/lib/sampling/README.md
+++ b/lib/sampling/README.md
@@ -11,7 +11,7 @@ interface:
- `can_get?(User, String setting_name) => Fixnum`
- Returns whether or nat this sampling method can get a specifed
+ Returns whether or not this sampling method can get a specifed
statistic; 0 means 'false', positive integers mean 'true', where
higher numbers are higher priority.