Skip to content

Commit

Permalink
fixed prettier include checks
Browse files Browse the repository at this point in the history
  • Loading branch information
Ziumper committed Jun 8, 2024
1 parent e1fb40a commit ab695fe
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
assets/css/main.scss
assets/plotly/demo.html
lighthouse_results/**
archive/**
archive/**
_includes/head.liquid
_includes/scripts/leaflet.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ First, you should install and configure [GitExtensions](https://git-extensions-d
</div>
</div>


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?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Po pierwsze, powinieneś zainstalować i skonfigurować [GitExtensions](https://
</div>
</div>


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?
Expand Down

0 comments on commit ab695fe

Please sign in to comment.