diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 18:18:07 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 18:18:07 +0200 |
| commit | 52eadb6a5be6ab823785d9b58cb19df226004545 (patch) | |
| tree | 71b406abc4bb2ab498f1fb2b83912eb7cc4fd424 | |
| parent | c0d028010b081020352444078a685ee60bffe209 (diff) | |
| parent | fd8c81f5c338e4f1448007c9100d15d912fadd27 (diff) | |
| download | coderay-52eadb6a5be6ab823785d9b58cb19df226004545.tar.gz | |
Merge branch 'go-scanner' of github.com:rubychan/coderay into go-scanner
Conflicts:
lib/coderay/scanners/go.rb
| -rw-r--r-- | lib/coderay/scanners/go.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/scanners/go.rb b/lib/coderay/scanners/go.rb index 23cbfe6..49d24c2 100644 --- a/lib/coderay/scanners/go.rb +++ b/lib/coderay/scanners/go.rb @@ -23,7 +23,7 @@ module Scanners 'int8', 'int16', 'int32', 'int64', 'float32', 'float64', 'complex64', 'complex128', - 'byte', 'rune', 'string', + 'byte', 'rune', 'string', 'error', 'uint', 'int', 'uintptr', ] # :nodoc: |