From ab695fe694da167034bf734bc7e3f7e6ae11dee7 Mon Sep 17 00:00:00 2001 From: Tomasz Komoszeski Date: Sat, 8 Jun 2024 16:47:07 +0200 Subject: [PATCH] fixed prettier include checks --- .prettierignore | 4 +++- ...-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md | 1 - ...-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.prettierignore b/.prettierignore index c6f9f8ca..1cda7cd7 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,4 +3,6 @@ assets/css/main.scss assets/plotly/demo.html lighthouse_results/** -archive/** \ No newline at end of file +archive/** +_includes/head.liquid +_includes/scripts/leaflet.liquid \ No newline at end of file diff --git a/_i18n/en/_posts/2022-08-06-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md b/_i18n/en/_posts/2022-08-06-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md index 099faac2..ba3cfb8d 100644 --- a/_i18n/en/_posts/2022-08-06-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md +++ b/_i18n/en/_posts/2022-08-06-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md @@ -19,7 +19,6 @@ First, you should install and configure [GitExtensions](https://git-extensions-d - It contains on hello.html file with the same line edited so it does not know which line it should take when [conflict](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) happens. ## How to rebase? diff --git a/_i18n/pl/_posts/2022-08-06-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md b/_i18n/pl/_posts/2022-08-06-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md index 3e074389..d57f6fdc 100644 --- a/_i18n/pl/_posts/2022-08-06-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md +++ b/_i18n/pl/_posts/2022-08-06-how-to-solve-rebase-merge-conflicts-with-GitExtensions.md @@ -18,7 +18,6 @@ Po pierwsze, powinieneś zainstalować i skonfigurować [GitExtensions](https:// - Zawiera plik hello.html z tym samym edytowanym wierszem, więc nie wie, który wiersz powinien być użyty, gdy [conflict](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) wystąpi. ## Jak zmienić baze?