Skip to content

Alex feature #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexa90 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Alex feature #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5455f3
Added my name
alexa90 Sep 8, 2014
65ebfa4
Mitt commitmeddelande#
alexa90 Sep 8, 2014
227dbe3
dogname
alexa90 Sep 8, 2014
50aa495
its working
alexa90 Sep 8, 2014
571024d
Changed a little bit
alexa90 Sep 8, 2014
2a84299
changed haha
alexa90 Sep 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions alex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Hello, my name is Alex!
I am 24 years old.
1 change: 1 addition & 0 deletions dog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
My dogs name is Mozart!
1 change: 1 addition & 0 deletions hello.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Hello World
Hello Universe
hahahahahahhaahaha
2 changes: 2 additions & 0 deletions working.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
this is working!!
let's conflict!