resolve conflicts

2015-09-28 19:07:31 -07:00
parent 50ee82e8bd
commit 5c526995d8
2 changed files with 0 additions and 10 deletions
--- a/install/update.php
+++ b/install/update.php
@@ -1885,6 +1885,3 @@ function update_r1155() {
 	return UPDATE_FAILED;
 }

-function update_r1155() {
-	return UPDATE_SUCCESS;
-}