From ab17fb270c33f5905b49321cca193e8b194e45a1 Mon Sep 17 00:00:00 2001 From: Darkko Date: Tue, 3 Sep 2024 10:46:23 -0600 Subject: [PATCH] =?UTF-8?q?A=C3=B1adiendo=20la=20rama=20desarrollo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TailwindCSS | 1 + index.html | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 TailwindCSS diff --git a/TailwindCSS b/TailwindCSS new file mode 160000 index 0000000..0ee8241 --- /dev/null +++ b/TailwindCSS @@ -0,0 +1 @@ +Subproject commit 0ee824128da8854860446ed1885390b725364a82 diff --git a/index.html b/index.html index f5aed4c..6686886 100644 --- a/index.html +++ b/index.html @@ -7,12 +7,19 @@
-

Hola Mundo

+

Hola Mundo

+

Lorem ipsum dolor, sit amet consectetur adipisicing elit. Este cambio esta hecho en la ramaConflicto, amet at dolorem hic, laborum vel quibusdam non. Doloremque beatae mollitia esse officia quam, quod blanditiis ut.

+
+

Rama Desarrollo

+

Lorem ipsum dolor, sit amet consectetur adipisicing elit. Eligendi debitis corrupti quaerat quasi. + +

+