summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-10-11 11:23:54 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-10-11 11:23:54 -0400
commit9ea0219173101beaf6a18830e38740a96488bf38 (patch)
treefbb37b9e75393b66fe126311d07965a632538519
parentd40dc6c2a523bc4756b89f9e0973b93b13e44a73 (diff)
parent317958e1bc2a8486a2ebd067cb1c5fa85003d321 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/forum/non_fast_forward_error_with_git_annex_sync/comment_3_bbb3a5572fa2427d9bf859ae1ba68764._comment9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/forum/non_fast_forward_error_with_git_annex_sync/comment_3_bbb3a5572fa2427d9bf859ae1ba68764._comment b/doc/forum/non_fast_forward_error_with_git_annex_sync/comment_3_bbb3a5572fa2427d9bf859ae1ba68764._comment
new file mode 100644
index 000000000..53e19eef4
--- /dev/null
+++ b/doc/forum/non_fast_forward_error_with_git_annex_sync/comment_3_bbb3a5572fa2427d9bf859ae1ba68764._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="matyasbot@fd008517d046c382e18306c0b3db48eb58d45dee"
+ nickname="matyasbot"
+ avatar="http://cdn.libravatar.org/avatar/c1b6b47dcdf2962858e6aad44a3cec66"
+ subject="comment 3"
+ date="2017-10-11T15:17:55Z"
+ content="""
+No, that is exactly where I set it.
+"""]]