fix: snap conflict

snap/snapcraft.yaml

@@ -1,34 +1,5 @@
 name: wireguard-gui # you probably want to 'snapcraft register <name>'
 base: core22 # the base snap is the execution environment for this snap
-<<<<<<< Updated upstream
-version: '0.1' # just for humans, typically '1.2+git' or '1.3.2'
-summary: Wireguard client gui made with nextauri
-description: |
-  Provide a Wireguard client gui for easy profile management
-grade: devel # must be 'stable' to release into candidate/stable channels
-confinement: devmode # use 'strict' once you have the right plugs and slots
-
-apps:
-  wireguard-gui:
-    extensions: [gnome]
-    command: usr/bin/wireguard-gui
-    desktop: usr/share/applications/com.wireguard-gui.gg
-    common-id: com.wireguard-gui.gg
-    plugs:
-      - gsettings
-      - cups
-
-slots:
-  gnome-text-editor:
-    interface: dbus
-    bus: session
-    name: com.wireguard-gui
-
-parts:
-  my-part:
-    # See 'snapcraft plugins'
-    plugin: nil
-=======
 version: '0.1.1' # just for humans, typically '1.2+git' or '1.3.2'
 summary: Wireguard client GUI made with nextauri
 icon: src-tauri/icons/128x128.png
@@ -90,4 +61,3 @@ layout:
     bind: $SNAP_DATA/conf
   /var/lib/NetworkManager:
     bind: $SNAP_DATA/var/lib/NetworkManager
->>>>>>> Stashed changes