git.samba.org
/
obnox
/
wiki2beamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d8be85a
)
fix: typo in example
author
Kai Dietrich
<mail@cleeus.de>
Sat, 31 Mar 2012 21:02:24 +0000
(23:02 +0200)
committer
Kai Dietrich
<mail@cleeus.de>
Sat, 31 Mar 2012 21:02:24 +0000
(23:02 +0200)
tests/example/example.txt
patch
|
blob
|
history
diff --git
a/tests/example/example.txt
b/tests/example/example.txt
index 530427185443d62dce11423f8238954943337906..62e25620e4df4be37d83e1d7429e93a96f31fd54 100644
(file)
--- a/
tests/example/example.txt
+++ b/
tests/example/example.txt
@@
-810,7
+810,7
@@
you can (and should) of course use your favourite version control system,
but you'd still have to resolve conflicts. To reduce the number of conflicts,
wiki2beamer can build presentations from multiple input files.
-==== Mul
it
ple inputs by commandline ====
+==== Mul
ti
ple inputs by commandline ====
The first way is to use the commandline to concatenate multiple input files:
--1em--