merge error behoben

Merge branch 'developer'

# Conflicts:
#	Datei1.txt

.gitignore

@@ -36,3 +36,4 @@ vignettes/*.pdf
 # Shiny token, see https://shiny.rstudio.com/articles/shinyapps.html
 rsconnect/
 
+.Rproj.user

Datei1.txt

@@ -0,0 +1,17 @@
+Hello Akira!
+
+Lorem Ipsum
+
+def neue_funktion():
+	print("funk")
+
+def schleife():
+	for i in range(10):
+		print(i)
+
+aki <- func(x) { 
+  print(x)
+}
+
+plot(1:10, rep(1,10))
+lines(1:10, 1:10)

Demo.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: XeLaTeX