tim/Git-Advanced-Workshop
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

rebase-this-branch #1

Open
tim wants to merge 7 commits from rebase-this-branch into master
pull from: rebase-this-branch
merge into: tim:master
Conversation 0 Commits 7 Files Changed 5 +21
5 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -0,0 +1 @@
Dit repository is de basis van de workshop Git Intermediate op 3 december 2020.

9
emweb.txt Normal file
View File

@@ -0,0 +1,9 @@
__
| \
______ ______ ____ __ __ __ ______ | ▓▓____
/ \| \ \| \ | \ | \/ \| ▓▓ \
| ▓▓▓▓▓▓\ ▓▓▓▓▓▓\▓▓▓▓\ ▓▓ | ▓▓ | ▓▓ ▓▓▓▓▓▓\ ▓▓▓▓▓▓▓\
| ▓▓ ▓▓ ▓▓ | ▓▓ | ▓▓ ▓▓ | ▓▓ | ▓▓ ▓▓ ▓▓ ▓▓ | ▓▓
| ▓▓▓▓▓▓▓▓ ▓▓ | ▓▓ | ▓▓ ▓▓_/ ▓▓_/ ▓▓ ▓▓▓▓▓▓▓▓ ▓▓__/ ▓▓
\▓▓ \ ▓▓ | ▓▓ | ▓▓\▓▓ ▓▓ ▓▓\▓▓ \ ▓▓ ▓▓
\▓▓▓▓▓▓▓\▓▓ \▓▓ \▓▓ \▓▓▓▓▓\▓▓▓▓ \▓▓▓▓▓▓▓\▓▓▓▓▓▓▓

3
extra-file.txt Normal file
View File

@@ -0,0 +1,3 @@
This is an extra file
It has more than one line
Namely three

2
some_code_file.py Normal file → Executable file
View File

@@ -1,3 +1,5 @@
#!/usr/bin/env python
value = 3
def print_5():

6
wt.txt Normal file
View File

@@ -0,0 +1,6 @@
_
_ _ __| |__
| | | | ( ___)
| | | | | || |
| \_/ \_/ || |__
\__/\___/ \___)