From c72ac085baf86f67497e54b0d5c2ec3ab9582851 Mon Sep 17 00:00:00 2001
From: Karim Naufal <rimkashox@gmail.com>
Date: Thu, 17 Feb 2022 22:12:41 +0100
Subject: [PATCH] merged k3s-install into master

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 228a291..16bc502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,5 @@ crash.log
 kubeconfig.yaml
 kubeconfig.yaml-e
 terraform.tfvars
-<<<<<<< HEAD
-plans.yaml
-=======
 plans.yaml
 traefik_config.yaml
->>>>>>> k3s-install