Solve conflict

Anduin2017 · Anduin2017 · commit 8ca923ce036d · 2026-01-03T10:01:13.000Z
diff --git a/config/all.json b/config/all.json
@@ -174,7 +174,7 @@
         "timezone": "America/Sao_Paulo",
         "config_weather_location": "[(uint32 0, 'São Paulo, Brasil', uint32 0, '-23.5505199,-46.6333094')]",
         "config_input_method": "[('xkb', 'us'), ('xkb', 'br')]",
-        "live_ubuntu_mirror": "https://mirror.uepg.br/ubuntu/",
+        "live_ubuntu_mirror": "https://ubuntu.mirror.letscloud.io/ubuntu/",
         "live_firefox_mirror": "ppa.launchpadcontent.net"
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@`
`174`	`174`	`"timezone": "America/Sao_Paulo",`
`175`	`175`	`"config_weather_location": "[(uint32 0, 'São Paulo, Brasil', uint32 0, '-23.5505199,-46.6333094')]",`
`176`	`176`	`"config_input_method": "[('xkb', 'us'), ('xkb', 'br')]",`
`177`		`- "live_ubuntu_mirror": "https://mirror.uepg.br/ubuntu/",`
	`177`	`+ "live_ubuntu_mirror": "https://ubuntu.mirror.letscloud.io/ubuntu/",`
`178`	`178`	`"live_firefox_mirror": "ppa.launchpadcontent.net"`
`179`	`179`	`},`
`180`	`180`	`{`