← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/es/user-guide/index.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-04 17:56:49 UTC
  • mfrom: (4929.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100104175649-lb0fpgzbuyu91ltv
(vila) Cleanup conflicts docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/es/user-guide/index.txt
50
50
.. include later - partner_intro.txt
51
51
.. include later - branching_a_project.txt
52
52
.. include later - merging_changes.txt
53
 
.. include:: resolving_conflicts.txt
 
53
.. include later - resolving_conflicts.txt
54
54
.. include later - annotating_changes.txt
55
55
 
56
56