Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/guided.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/examples/guided.py b/examples/guided.py
index e45868ef..1af57fd6 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -291,16 +291,8 @@ def perform_installation(mountpoint):
if installation.minimal_installation():
installation.set_hostname(archinstall.arguments['hostname'])
-<<<<<<< HEAD
if archinstall.arguments['mirror-region'] != None:
installation.set_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors in the installation medium
-=======
-
- # Configure the selected mirrors in the installation
- if archinstall.arguments.get('mirror-region', None):
- installation.set_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors in the installation medium
-
->>>>>>> af2671c1ec1ac2ecbdbd35c90c3e5016dcf516ed
installation.set_keyboard_language(archinstall.arguments['keyboard-language'])
installation.add_bootloader()