← 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: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/es/user-guide/index.txt
10
10
..   level 3 ~~~~~~~~
11
11
..   level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
12
12
 
13
 
.. contents:: :depth: 2
14
 
.. sectnum::
15
 
 
16
13
 
17
14
Introducción
18
15
############
53
50
.. include later - partner_intro.txt
54
51
.. include later - branching_a_project.txt
55
52
.. include later - merging_changes.txt
56
 
.. include:: resolving_conflicts.txt
 
53
.. include later - resolving_conflicts.txt
57
54
.. include later - annotating_changes.txt
58
55
 
59
56
 
103
100
.. include later - server.txt
104
101
.. include later - hooks.txt
105
102
.. include:: version_info.txt
106
 
 
 
103
 
107
104
 
108
105
Apéndice
109
106
########