Manually merged changes to .htaccess file resolving conflicts due to my changes of the file.

1 files changed, 5 insertions, 2 deletions

diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
index bbe6fc65..2faa598b 100644
--- a/modules/organize/helpers/organize_installer.php
+++ b/modules/organize/helpers/organize_installer.php
@@ -22,12 +22,15 @@ class organize_installer {
     site_status::clear("organize_needs_rest");
   }
 
+  static function install() {
+    module::set_version("organize", $version = 2);
+  }
+
   static function upgrade($version) {
     if ($version == 1) {
       if (!module::is_active("rest")) {
         site_status::warning(
-          t("The Organize module requires the Rest module.  " .
-            "<a href=\"%url\">Activate the Rest module now</a>",
+          t("The Organize module requires the Rest module.  <a href=\"%url\">Activate the Rest module now</a>",
             array("url" => html::mark_clean(url::site("admin/modules")))),
           "organize_needs_rest");
       }