Skip to content

Feature/miikka#8

Merged
malatalo merged 3 commits intomasterfrom
feature/Miikka
Sep 13, 2017
Merged

Feature/miikka#8
malatalo merged 3 commits intomasterfrom
feature/Miikka

Conversation

@ollilappalainen
Copy link
Copy Markdown
Collaborator

Please see this commit.

@@ -1 +1,5 @@
Miikka No newline at end of file
<<<<<<< HEAD
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this line.

@ollilappalainen
Copy link
Copy Markdown
Collaborator Author

Unnecessary stuff removed.

Copy link
Copy Markdown
Collaborator

@malatalo malatalo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve

@malatalo malatalo merged commit fbb54bf into master Sep 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants