Skip to content
Snippets Groups Projects
Commit f28a3527 authored by Ciaron Linstead's avatar Ciaron Linstead
Browse files

Merge branch 'master' into 'patch-1'

# Conflicts:
#   README
parents 875dc1f9 7f9cd656
No related branches found
No related tags found
1 merge request!2Update README in markdown
......@@ -2,4 +2,7 @@
## Note
Some text in *markdown* syntex. Very __cool__.
\ No newline at end of file
hfdjslfhls
jdkl;sjfdls
Implementing issue #1872
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment