From c686a38858f0d70643a314d7af4699aba65cb2f0 Mon Sep 17 00:00:00 2001
From: karin_pettersen <karinep@stud.ntnu.no>
Date: Fri, 18 Feb 2022 09:45:52 +0100
Subject: [PATCH] fixing master

---
 .idea/encodings.xml | 6 ++++++
 .idea/vcs.xml       | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..97626ba
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
-- 
GitLab