From 40c6362fbe8b0832bbe3973a61a2e986260c3780 Mon Sep 17 00:00:00 2001
From: Astrid Elocson <aelocson@gmail.com>
Date: Wed, 25 Feb 2015 07:57:55 +0000
Subject: [PATCH] Resolve merge conflict in LinkWidget.tid

---
 editions/tw5.com/tiddlers/widgets/LinkWidget.tid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
index 4406a9da2..97c787f1e 100644
--- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
@@ -1,6 +1,6 @@
 title: LinkWidget
 created: 201310241419
-modified: 20150220161251000
+modified: 20150225075728000
 tags: Widgets
 caption: link