[MERGE] with parent branch

bzr revid: dizzy.zala@gmail.com-20140328044741-r2tmeujwibtqpwdb

1 files changed, 0 insertions, 28 deletions

diff --git a/addons/document_ftp/__init__.py b/addons/document_ftp/__init__.py
deleted file mode 100644
index e7e4a647563..00000000000
--- a/addons/document_ftp/__init__.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import ftpserver
-import wizard
-import res_config
-
-post_load = ftpserver.start_server
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: