nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove merge conflict marker

Browse source
This commit is contained in:
Jonne Haß 2013-01-09 00:17:26 +01:00
parent a09a8cbffc
commit 414e29f23e
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
# 0.0.3.0 # 0.0.3.0
## Refactor ## Refactor