fix: resolve LICENSE merge conflicts, update AUR PKGBUILD

LICENSE

@@ -392,13 +392,8 @@ governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
-<<<<<<< HEAD
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
-=======
-of that license document, provided that the further restriction does not
-survive such relicensing or conveying.
->>>>>>> 049e4f1 (Initial commit: LoFlum FTP/SFTP client)
 
   If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
@@ -516,20 +511,12 @@ in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
 
   If, pursuant to or in connection with a single transaction or
-<<<<<<< HEAD
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
-=======
-arrangement, you convey, or procure by conveying, a covered work, and
-grant a patent license to some of the parties receiving the covered work
-authorizing them to use, propagate, modify or convey a specific copy of
-the covered work, then the patent license you grant is automatically
-extended to all recipients of the covered work and works based on it.
->>>>>>> 049e4f1 (Initial commit: LoFlum FTP/SFTP client)
 
   A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
@@ -547,13 +534,8 @@ contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
 
   Nothing in this License shall be construed as excluding or limiting
-<<<<<<< HEAD
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
-=======
-any implied license or other defenses to infringement that may be
-otherwise available to you under applicable patent law.
->>>>>>> 049e4f1 (Initial commit: LoFlum FTP/SFTP client)
 
   12. No Surrender of Others' Freedom.
 
@@ -594,11 +576,7 @@ Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
-<<<<<<< HEAD
   If the Program specifies that a proxy can decide which future
-=======
-  If the Program specifies that a proxy can decide whether future
->>>>>>> 049e4f1 (Initial commit: LoFlum FTP/SFTP client)
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.

dist/.SRCINFO

@@ -7,7 +7,6 @@ pkgbase = wherry
 	license = GPL3
 	makedepends = cargo
 	makedepends = pkg-config
-	makedepends = patchelf
 	depends = gcc-libs
 	depends = gtk3
 	depends = webkit2gtk-4.1
@@ -18,7 +17,6 @@ pkgbase = wherry
 	depends = librsvg
 	depends = openssl
 	depends = libssh2
-	depends = libappindicator-gtk3
 	depends = dbus
 	source = https://github.com/loki5512344/Wherry/archive/refs/tags/v0.1.0.tar.gz
 	sha256sums = SKIP

dist/PKGBUILD

@@ -18,10 +18,9 @@ depends=(
   'librsvg'
   'openssl'
   'libssh2'
-  'libappindicator-gtk3'
   'dbus'
 )
-makedepends=('cargo' 'pkg-config' 'patchelf')
+makedepends=('cargo' 'pkg-config')
 source=("https://github.com/loki5512344/Wherry/archive/refs/tags/v$pkgver.tar.gz")
 sha256sums=('SKIP')