summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-29 14:50:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-29 14:50:21 -0400
commitf62e5c41e4621940a863b35c9c54e0626587a694 (patch)
tree2860ba424cd76e16fa474ce8c902eac3680aa4b6
parent602c73803b5adedc04c53af0760bb233c0fa33cd (diff)
parent881c277dc071164e4db7a25f7ec0b7f17170e072 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment b/doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment
new file mode 100644
index 000000000..52bdc7f4e
--- /dev/null
+++ b/doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~mattharrison"
+ ip="69.193.72.98"
+ subject="Pairing"
+ date="2012-10-29T17:56:06Z"
+ content="""
+Is there a way to do this pairing with one machine being a desktop machine and one a headless machine?
+"""]]