From 42dd0fc334548c3cb4b8a5162ec7d79bf8b05607 Mon Sep 17 00:00:00 2001
From: Simon <simon.bartke@uni-hamburg.de>
Date: Tue, 6 Sep 2022 16:55:14 +0200
Subject: [PATCH] created r file to show mc

---
 .gitignore                  |  4 ++++
 create_mc.R                 |  3 +++
 create_merge_conflict.Rproj | 13 +++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 create_mc.R
 create mode 100644 create_merge_conflict.Rproj

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5b6a065
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.Rproj.user
+.Rhistory
+.RData
+.Ruserdata
diff --git a/create_mc.R b/create_mc.R
new file mode 100644
index 0000000..c728028
--- /dev/null
+++ b/create_mc.R
@@ -0,0 +1,3 @@
+a <- 0
+b <- 1
+c <- 2
diff --git a/create_merge_conflict.Rproj b/create_merge_conflict.Rproj
new file mode 100644
index 0000000..8e3c2eb
--- /dev/null
+++ b/create_merge_conflict.Rproj
@@ -0,0 +1,13 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
-- 
GitLab