RecklingK/Demo
0
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

merge error behoben

Browse Source 
Merge branch 'developer'

# Conflicts:
#	Datei1.txt
This commit is contained in:
Reckling
2019-12-19 14:39:54 +01:00
parent b6bff5d579 b9e1fc5c53
commit 09bc50a164
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Datei1.txt
View File

@@ -5,8 +5,13 @@ Lorem Ipsum
def neue_funktion(): def neue_funktion():
print("funk") print("funk")
def schleife():
for i in range(10):
print(i)
aki <- func(x) { aki <- func(x) {
print(x) print(x)
} }
plot(1:10, rep(1,10)) plot(1:10, rep(1,10))
lines(1:10, 1:10)