diff options
| author |  Richard Hartmann <richih.mailinglist@gmail.com> | 2013-05-01 23:46:14 +0200 |
|---|---|---|
| committer | Richard Hartmann <richih.mailinglist@gmail.com> | 2013-05-01 23:46:14 +0200 |
| commit | debcec9e756fc56b445635f2177ae63a7ca23b67 (patch) | |
| tree | 48d922189ca07bbd9b779fe2ecd25a6528bb1e44 /doc | |
| parent | cadaa34d45a8539b7c29eb3c802fa6383fc21b21 (diff) | |
Two typos
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/design/assistant/blog/day_251__xmpp_improvements.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn b/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn index 35dc86b38..7007d7c0d 100644 --- a/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn +++ b/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn @@ -3,7 +3,7 @@ since February, or possibly earlier, not counting trips. Whoops! Also, I was feeling overwhelmed with the complexity of fixing XMPP to not be buggy when there are multiple separate repos using the same XMPP -account. Let my subconcious work on that, and last night it served up the +account. Let my subconscious work on that, and last night it served up the solution, in detail. Built it today. It's only a partial solution, really. If you want to use the same XMPP @@ -21,7 +21,7 @@ Before, it would merge them all together without warning. ---- While I was testing that, I think I found out the real reason why XMPP -pushes have seemed a little unrelaible. It turns out to not be an XMPP +pushes have seemed a little unreliable. It turns out to not be an XMPP issue at all! Instead, the merger was simply not always noticing when `git receive-pack` updated a ref, and not merging it into master. That was easily fixed. |