resolve conflicts

netbirdio · Sep 8, 2024 · bedbe58 · bedbe58
1 parent 4e7c1cb
commit bedbe58
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/.github/workflows/test-infrastructure-files.yml b/.github/workflows/test-infrastructure-files.yml
@@ -291,21 +291,3 @@ jobs:
 
       - name: test relay.env file gen CockroachDB
         run: test -f relay.env
-
-  test-download-geolite2-script:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install jq
-        run: sudo apt-get update && sudo apt-get install -y unzip sqlite3
-
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: test script
-        run: bash -x infrastructure_files/download-geolite2.sh
-
-      - name: test mmdb file exists
-        run: test -f GeoLite2-City.mmdb
-
-      - name: test geonames file exists
-        run: test -f geonames.db
diff --git a/client/ui/bundled.go b/client/ui/bundled.go