From 2c42960b93e2fbcd0ee769c52735b86d107b4fb8 Mon Sep 17 00:00:00 2001
From: ycc <yves.cc@laposte.net>
Date: Thu, 28 Oct 2021 10:58:48 +0200
Subject: [PATCH] merge conflicts

---
 .gitignore | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f4d432a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# ---> Go
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-