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(-) 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