From 10ee5265e1786a688ef20c9b171c893837b36b59 Mon Sep 17 00:00:00 2001 From: CrawKatt Date: Wed, 8 Mar 2023 18:33:51 -0300 Subject: [PATCH] resolviendo conflicto para rebase --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a25e312..be51322 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,8 @@ \#*# public_html/ .hugo_build.lock -.idea/ \ No newline at end of file +<<<<<<< HEAD +.idea/ +======= +.idea/ +>>>>>>> c7947e0 (borrando articulo descartado) -- 2.25.1