Fixes rebase conflict

Author: AndreMiras

pythonforandroid/distribution.py

@@ -2,7 +2,7 @@
 import glob
 import json
 
-from pythonforandroid.logger import (info, info_notify, Err_Style, Err_Fore)
+from pythonforandroid.logger import (info, info_notify, warning, Err_Style, Err_Fore)
 from pythonforandroid.util import current_directory, BuildInterruptingException
 from shutil import rmtree
 
@@ -130,21 +130,7 @@ def get_distribution(cls, ctx, name=None, recipes=[],
         # If there was a name match but we didn't already choose it,
         # then the existing dist is incompatible with the requested
         # configuration and the build cannot continue
-<<<<<<< HEAD
         if name_match_dist is not None and not allow_replace_dist:
-            error('Asked for dist with name {name} with recipes ({req_recipes}) and '
-                  'NDK API {req_ndk_api}, but a dist '
-                  'with this name already exists and has either incompatible recipes '
-                  '({dist_recipes}) or NDK API {dist_ndk_api}'.format(
-                      name=name,
-                      req_ndk_api=ndk_api,
-                      dist_ndk_api=name_match_dist.ndk_api,
-                      req_recipes=', '.join(recipes),
-                      dist_recipes=', '.join(name_match_dist.recipes)))
-            error('No compatible dist found, so exiting.')
-            exit(1)
-=======
-        if name_match_dist is not None:
             raise BuildInterruptingException(
                 'Asked for dist with name {name} with recipes ({req_recipes}) and '
                 'NDK API {req_ndk_api}, but a dist '
@@ -155,7 +141,6 @@ def get_distribution(cls, ctx, name=None, recipes=[],
                     dist_ndk_api=name_match_dist.ndk_api,
                     req_recipes=', '.join(recipes),
                     dist_recipes=', '.join(name_match_dist.recipes)))
->>>>>>> Replaced many exit(1)s with exceptions
 
         # If we got this far, we need to build a new dist
         dist = Distribution(ctx)