From a56e1e88a08c5a3b41372d53acd2b144ae287340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 14 Jun 2021 07:27:19 +0200 Subject: move .gitignore to the right place --- .gitignore | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .gitignore (limited to '.gitignore') diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f33db6c --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +*.aux +*.bbl +*.bib +*.blg +*.idx +*.ilg +*.ind +*.log +*.out +*.rpt +buch*.pdf +*.run.xml +*.toc +.build/ +*.synctex.gz +*.DS_Store + -- cgit v1.2.1 From 802f2a44be8be4728fd55fc0ff5220785d965baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 14 Jun 2021 07:30:50 +0200 Subject: Merge IFS --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 03ffd40..cc64005 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,6 @@ buch*.pdf *.toc .build/ *.synctex.gz -<<<<<<< HEAD:.gitignore *.DS_Store -======= ->>>>>>> a787d334bf167a0d878fde6b03369a8817bcf691:buch/.gitignore + -- cgit v1.2.1