Rev 2928: Typo in conflicts.txt (bug #156015) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2928
revision-id: pqm at pqm.ubuntu.com-20071023030547-pjlo1thei6q984os
parent: pqm at pqm.ubuntu.com-20071022212520-al7xlieh3d7ng370
parent: john at arbash-meinel.com-20071023021937-4kt812tl8m2eies6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-10-23 04:05:47 +0100
message:
  Typo in conflicts.txt (bug #156015)
modified:
  doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
    ------------------------------------------------------------
    revno: 2927.1.1
    merged: john at arbash-meinel.com-20071023021937-4kt812tl8m2eies6
    parent: pqm at pqm.ubuntu.com-20071022212520-al7xlieh3d7ng370
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2007-10-22 21:19:37 -0500
    message:
      Typo in conflicts.txt (bug #156015)
=== modified file 'doc/en/user-guide/conflicts.txt'
--- a/doc/en/user-guide/conflicts.txt	2007-08-10 05:17:09 +0000
+++ b/doc/en/user-guide/conflicts.txt	2007-10-23 02:19:37 +0000
@@ -169,6 +169,6 @@
 MalformedTransform
 ==================
 It is possible (though very rare) for Bazaar to raise a MalformedTransform
-exception.  This means that Bazaar encounted a filesystem conflict that it was
+exception.  This means that Bazaar encountered a filesystem conflict that it was
 unable to resolve.  This usually indicates a bug.  Please let us know if you
 encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs