From 5c526995d8534465602775dfddebd8d77855d2e2 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 28 Sep 2015 19:07:31 -0700 Subject: resolve conflicts --- install/update.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'install') 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; -} -- cgit v1.2.3