diff options
author | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-11-19 21:26:50 +0100 |
---|---|---|
committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-11-19 21:26:50 +0100 |
commit | 703aeaef1a43b07dc5497dba72c98151466396cc (patch) | |
tree | 1e18a6b3fc3c28156c2e56f8a3d515b8dd6a9cf9 /inc/DifferenceEngine.php | |
parent | 33c3b3817b00aa9384760813643fac0e33daaaff (diff) | |
parent | 14b3007921f7b66fc9e3621b861a3c83e7e9093c (diff) | |
download | rpg-703aeaef1a43b07dc5497dba72c98151466396cc.tar.gz rpg-703aeaef1a43b07dc5497dba72c98151466396cc.tar.bz2 |
Merge remote-tracking branch 'origin/master' into diff_navigation
Diffstat (limited to 'inc/DifferenceEngine.php')
-rw-r--r-- | inc/DifferenceEngine.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/DifferenceEngine.php b/inc/DifferenceEngine.php index 07df7a4be..3c955cf88 100644 --- a/inc/DifferenceEngine.php +++ b/inc/DifferenceEngine.php @@ -826,7 +826,7 @@ class DiffFormatter { * @param $str string Text string to escape * @return string The escaped string. */ - function _escape($str){ + function _escape($str){ return $str; } } |