Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
Federico Berti committed Jun 18, 2018
2 parents 8d719d1 + 925ed50 commit 09e33f2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# OmegaDrive
# OmegaDrive

0 comments on commit 09e33f2

Please sign in to comment.