merge error behoben

Merge branch 'developer' # Conflicts: # Datei1.txt
2019-12-19 14:39:54 +01:00
parent b6bff5d579 b9e1fc5c53
commit 09bc50a164
1 changed files with 5 additions and 0 deletions
--- a/Datei1.txt
+++ b/Datei1.txt
@@ -5,8 +5,13 @@ 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)