1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-14 09:36:48 +00:00

Fix merge conflict

This commit is contained in:
Jermolene 2015-01-26 21:46:12 +00:00
commit 59db869deb

View File

@ -208,3 +208,5 @@ Arlen Beiler, @arlen22, 2014/12/30
David P Dannemiller, @dpdannemiller, 2015/01/10
Ben Williams, @Mathobal, 2015/01/26
Neil Griffin, @ng110, 2015/01/20