Fix: removed incoming change from actual file lol

Signed-off-by: deggja <danieldagfinrud@gmail.com>
deggja · Nov 24, 2023 · 441e039 · 441e039
1 parent ff46f0f
commit 441e039
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/netfetch.rb b/netfetch.rb
@@ -1,13 +1,8 @@
 class Netfetch < Formula
     desc "CLI tool to scan for network policies in Kubernetes clusters"
     homepage "https://github.com/deggja/netfetch"
-<<<<<<< HEAD
     url "https://github.com/deggja/netfetch/releases/download/0.0.15/netfetch_0.0.15_darwin_amd64.tar.gz"
     sha256 "2bbf7cb3d50e477d45d6557417048a07b1d1f3884543cad3583049ef04072857"
-=======
-    url "https://github.com/deggja/netfetch/releases/download/0.0.9/netfetch_0.0.9_darwin_amd64.tar.gz"
-    sha256 "53bfbc3240986e4774ec2e7652be4bcac58c05e118d5443cbf0dd37ff8572722"
->>>>>>> be953cb5bea308074e3d9979057f2d9e94e5214e
 
     def install
       bin.install "netfetch"