diff options
| author | kali <kali@futeisha.org> | 2013-05-08 02:09:25 +0900 |
|---|---|---|
| committer | kali <kali@futeisha.org> | 2013-05-08 02:09:25 +0900 |
| commit | d8d4c91e88036726eb12d10aea6df2fba7c67ffa (patch) | |
| tree | 2e2422a39244a11277df4390b898226d9a14e1fd | |
| parent | 135dcb736d465a5dfb667fc87a082b5784e23e3f (diff) | |
| parent | de214ccc07827c5ebad70588fa0096392f49f9ba (diff) | |
fix conflict
| -rw-r--r-- | src/leap/mx/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/mx/__init__.py b/src/leap/mx/__init__.py index 2c4f106..c10c64d 100644 --- a/src/leap/mx/__init__.py +++ b/src/leap/mx/__init__.py @@ -15,6 +15,5 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. """ -Module intialization file for leap.mx . +Module initialization file for leap.mx . """ -__all__ = ['alias_resolver', 'couchdbhelper'] |