diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /extensions/SyntaxHighlight_GeSHi/geshi/docs/api/elementindex_geshi.html | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'extensions/SyntaxHighlight_GeSHi/geshi/docs/api/elementindex_geshi.html')
| -rw-r--r-- | extensions/SyntaxHighlight_GeSHi/geshi/docs/api/elementindex_geshi.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/SyntaxHighlight_GeSHi/geshi/docs/api/elementindex_geshi.html b/extensions/SyntaxHighlight_GeSHi/geshi/docs/api/elementindex_geshi.html index f3193965..c3403081 100644 --- a/extensions/SyntaxHighlight_GeSHi/geshi/docs/api/elementindex_geshi.html +++ b/extensions/SyntaxHighlight_GeSHi/geshi/docs/api/elementindex_geshi.html @@ -150,7 +150,7 @@ </dt> <dd class="index-item-body"> <div class="index-item-details"><a href="geshi/core/GeSHi.html#methoderror">GeSHi::error()</a> in geshi.php</div> - <div class="index-item-description">Returns an error message associated with the last GeSHi operation, or false if no error has occured</div> + <div class="index-item-description">Returns an error message associated with the last GeSHi operation, or false if no error has occurred</div> </dd> </dl> <a name="g"></a> |