From b21780c1cb09d6042cf236eedcebbde8562272c9 Mon Sep 17 00:00:00 2001
From: jorge-hangar <jorge@hangar.org>
Date: Wed, 28 Jul 2021 13:05:51 +0200
Subject: [PATCH] added a git merge rule to avoid default.css to be over
 written from other branches, instead it has to be created usin npm/gulp

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..ad3870a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+assets/css/default.css merge=ours