From e4525a95c57bd7b9c8bc30ace37ab12a985c5c7e Mon Sep 17 00:00:00 2001 From: Astrid Elocson Date: Wed, 25 Feb 2015 08:01:38 +0000 Subject: [PATCH] Try again to resolve merge conflict in LinkWidget.tid --- editions/tw5.com/tiddlers/widgets/ListWidget.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid index 89daddb96..6e80b2d76 100644 --- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid @@ -1,5 +1,5 @@ created: 201310241419 -modified: 20150106180000000 +modified: 201502231037 tags: Widgets title: ListWidget caption: list