aboutsummaryrefslogtreecommitdiff
path: root/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:
diff options
context:
space:
mode:
authorhttp://bob-bernstein.myopenid.com/ <bernstein@web>2014-05-26 00:29:45 -0400
committeradmin <admin@branchable.com>2014-05-26 00:29:45 -0400
commit4197761ffc8d20074a6b3ee4b8bce71a5eb2aa6c (patch)
treeb34682228df87d4976f517af4aab01831bf37f7d /doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:
parentc561e8c0fe04e6bebdb85b12e0e00dff22fb6178 (diff)
downloadikiwiki-4197761ffc8d20074a6b3ee4b8bce71a5eb2aa6c.tar
ikiwiki-4197761ffc8d20074a6b3ee4b8bce71a5eb2aa6c.tar.gz
Added a comment: Fat Fingers
Diffstat (limited to 'doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:')
-rw-r--r--doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_2_2466ce4303f5b8145bdfae23b6dbddda._comment10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_2_2466ce4303f5b8145bdfae23b6dbddda._comment b/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_2_2466ce4303f5b8145bdfae23b6dbddda._comment
new file mode 100644
index 000000000..690808a00
--- /dev/null
+++ b/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_2_2466ce4303f5b8145bdfae23b6dbddda._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://bob-bernstein.myopenid.com/"
+ nickname="bernstein"
+ subject="Fat Fingers"
+ date="2014-05-26T04:29:44Z"
+ content="""
+Make that last line, above:
+
+Thank youse ALL!
+"""]]