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/__filesource/fsource_geshi_core_geshi.php.html | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'extensions/SyntaxHighlight_GeSHi/geshi/docs/api/__filesource/fsource_geshi_core_geshi.php.html')
| -rw-r--r-- | extensions/SyntaxHighlight_GeSHi/geshi/docs/api/__filesource/fsource_geshi_core_geshi.php.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/SyntaxHighlight_GeSHi/geshi/docs/api/__filesource/fsource_geshi_core_geshi.php.html b/extensions/SyntaxHighlight_GeSHi/geshi/docs/api/__filesource/fsource_geshi_core_geshi.php.html index 3d799821..a8ff361c 100644 --- a/extensions/SyntaxHighlight_GeSHi/geshi/docs/api/__filesource/fsource_geshi_core_geshi.php.html +++ b/extensions/SyntaxHighlight_GeSHi/geshi/docs/api/__filesource/fsource_geshi_core_geshi.php.html @@ -615,7 +615,7 @@ <li><div class="src-line"><a name="a600"></a> </div></li> <li><div class="src-line"><a name="a601"></a> <span class="src-doc">/**</span></div></li> <li><div class="src-line"><a name="a602"></a><span class="src-doc"> * Returns an error message associated with the last GeSHi operation,</span></div></li> -<li><div class="src-line"><a name="a603"></a><span class="src-doc"> * or false if no error has occured</span></div></li> +<li><div class="src-line"><a name="a603"></a><span class="src-doc"> * or false if no error has occurred</span></div></li> <li><div class="src-line"><a name="a604"></a><span class="src-doc"> *</span></div></li> <li><div class="src-line"><a name="a605"></a><span class="src-doc"> * </span><span class="src-doc-coretag">@return </span><span class="src-doc-type">string</span><span class="src-doc">|</span><span class="src-doc-type">false</span><span class="src-doc">An error message if there has been an error, else false</span></div></li> <li><div class="src-line"><a name="a606"></a><span class="src-doc"> * </span><span class="src-doc-coretag">@since</span><span class="src-doc"> 1.0.0</span></div></li> |