aboutsummaryrefslogtreecommitdiffstats
path: root/install/update.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-28 19:07:31 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-28 19:07:31 -0700
commit5c526995d8534465602775dfddebd8d77855d2e2 (patch)
tree2285e6d7ae960853a72642bb5a76c8abba304464 /install/update.php
parent50ee82e8bd031abe969ad304233cfdb9849bdac6 (diff)
downloadvolse-hubzilla-5c526995d8534465602775dfddebd8d77855d2e2.tar.gz
volse-hubzilla-5c526995d8534465602775dfddebd8d77855d2e2.tar.bz2
volse-hubzilla-5c526995d8534465602775dfddebd8d77855d2e2.zip
resolve conflicts
Diffstat (limited to 'install/update.php')
-rw-r--r--install/update.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/install/update.php b/install/update.php
index ca4e90a9d..ace5239b5 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1885,6 +1885,3 @@ function update_r1155() {
return UPDATE_FAILED;
}
-function update_r1155() {
- return UPDATE_SUCCESS;
-}