[Pkg-privacy-commits] [torbrowser-launcher] 38/59: Merge branch 'feature-relative-import' of https://github.com/sedrubal/torbrowser-launcher into sedrubal-feature-relative-import

[Roger Shimizu]

This is an automated email from the git hooks/post-receive script.

rosh pushed a commit to branch debian/sid
in repository torbrowser-launcher.

commit 23568b58a7ed8db8507312fac0705fa4c29376f3
Merge: 49c7ae4 6951561
Author: Micah Lee <micah at micahflee.com>
Date:   Sun Jan 28 08:26:21 2018 -0800

    Merge branch 'feature-relative-import' of https://github.com/sedrubal/torbrowser-launcher into sedrubal-feature-relative-import

 torbrowser_launcher/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc torbrowser_launcher/__init__.py
index 73c6902,9998d87..57284a7
--- a/torbrowser_launcher/__init__.py
+++ b/torbrowser_launcher/__init__.py
@@@ -26,13 -26,11 +26,13 @@@ FROM, OUT OF OR IN CONNECTION WITH THE 
  OTHER DEALINGS IN THE SOFTWARE.
  """
  
 +from __future__ import print_function
 +
  import os, sys, argparse
  
- from common import Common, SHARE
- from settings import Settings
- from launcher import Launcher
+ from .common import Common, SHARE
+ from .settings import Settings
+ from .launcher import Launcher
  
  def main():
      # parse arguments

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git