diff options
Diffstat (limited to 'application/Updater.php')
-rw-r--r-- | application/Updater.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/application/Updater.php b/application/Updater.php index 6b94c5e3..86a21fc3 100644 --- a/application/Updater.php +++ b/application/Updater.php | |||
@@ -256,6 +256,8 @@ class Updater | |||
256 | } | 256 | } |
257 | 257 | ||
258 | /** | 258 | /** |
259 | <<<<<<< HEAD | ||
260 | ======= | ||
259 | * Rename tags starting with a '-' to work with tag exclusion search. | 261 | * Rename tags starting with a '-' to work with tag exclusion search. |
260 | */ | 262 | */ |
261 | public function updateMethodRenameDashTags() | 263 | public function updateMethodRenameDashTags() |