Merge branch 'fix/20210728' into fix/forms-seach-input-mods

Revert "Merge branch 'fix/hero-shown' into fix/20210728"
This reverts commit 12bade8fb2, reversing changes made to aefde4a14f.
2021-07-28 14:21:41 +02:00 · 2021-07-28 14:16:11 +02:00 · 2021-07-28 14:11:37 +02:00 · 2021-07-28 13:11:53 +02:00 · 2021-07-28 13:10:59 +02:00 · 2021-07-28 13:10:35 +02:00
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+default.css merge=ours
Author	SHA1	Message	Date
jorge	abb51ac63a	Merge branch 'fix/20210728' into fix/forms-seach-input-mods	2021-07-28 14:21:41 +02:00
jorge	3ac81dd207	Revert "Merge branch 'fix/hero-shown' into fix/20210728" This reverts commit `12bade8fb2`, reversing changes made to `aefde4a14f`.	2021-07-28 14:16:11 +02:00
jorge	12bade8fb2	Merge branch 'fix/hero-shown' into fix/20210728	2021-07-28 14:11:37 +02:00
jorge	aefde4a14f	default css after merge with fix/footer-layout	2021-07-28 13:11:53 +02:00
jorge	ac66b243bd	Merge branch 'fix/footer-layout' into fix/20210728	2021-07-28 13:10:59 +02:00
jorge	42ae15c4c4	css after merge with fix/button-sizes	2021-07-28 13:10:35 +02:00
jorge	f4c2ec5074	Merge branch 'fix/button-sizes' into fix/20210728	2021-07-28 13:07:35 +02:00
jorge	b21780c1cb	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	2021-07-28 13:05:51 +02:00
jorge	3d5081b975	Merge branch 'fix/20210728' into fix/hero-shown	2021-07-28 12:33:00 +02:00
jorge	f211fb8f41	mods on hero to be shown in collections	2021-07-20 11:59:26 +02:00