Fill out missing documentation.

[wizard.git] / wizard / app / wordpress.py

diff --git a/wizard/app/wordpress.py b/wizard/app/wordpress.py
index 62a41389b30d037b075bed11c29a603b45990097..9c99f4477762271bfb2590ffb347b56fe9be509e 100644 (file)
--- a/wizard/app/wordpress.py
+++ b/wizard/app/wordpress.py
@@ -44,11 +44,6 @@ class Application(app.Application):
         return self.checkWebPage(deployment, "", "<html")
     def detectVersion(self, deployment):
         return self.detectVersionFromFile("wp-includes/version.php", php.re_var("wp_version"))
-    def prepareMerge(self, deployment):
-        # This file shouldn't really be edited by users, but be careful: it's
-        # stored as DOS and not as UNIX, so you'll get conflicts if you add this line:
-        # resolve.fix_newlines("wp-config.php")
-        pass
     def install(self, version, options):
         util.soft_unlink("wp-config.php")