From 5e66177aa2602f163b64324407becf6ed39e85ca Mon Sep 17 00:00:00 2001
From: Joshua Fogg <joshua.h.fogg@gmail.com>
Date: Fri, 14 Aug 2020 12:41:57 +0100
Subject: [PATCH] Renamed .gitignore to avoid merge conflict

---
 .gitignore-beam | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .gitignore-beam

diff --git a/.gitignore-beam b/.gitignore-beam
new file mode 100644
index 0000000..76e082a
--- /dev/null
+++ b/.gitignore-beam
@@ -0,0 +1,6 @@
+*.log
+*.out
+main.pdf
+*.nav
+.DS_Store
+*.gz
-- 
GitLab