summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGNU Hurd wiki engine <web-hurd@gnu.org>2007-11-13 09:10:07 +0000
committerGNU Hurd wiki engine <web-hurd@gnu.org>2007-11-13 09:10:07 +0000
commitd0d908c7d9c4fefed30f8ee2002817acee88266c (patch)
treed34d01afdd8e77d8405ac859c67d528f89838b66
parenteb09e2f2f8ee6f5147d1973701bdf3122bb5841d (diff)
web commit by vincentvikram
-rw-r--r--emailfs.mdwn9
1 files changed, 5 insertions, 4 deletions
diff --git a/emailfs.mdwn b/emailfs.mdwn
index eb3804ee..8ff95bd4 100644
--- a/emailfs.mdwn
+++ b/emailfs.mdwn
@@ -31,7 +31,9 @@ is included in the section entitled
## Comments
IRC Logs about the discussion on #hurd
-&lt;pre>&lt;code>
+=======
+<pre><code>
+>>>>>>> 5384ccd0a47e900fbdae993143110538248517a2:emailfs.mdwn
&lt;manuel>j4v4m4n: isn't the HHG a good enough libtrivfs tutorial?&lt;br>
&lt;manuel> the problem I have with mail, blog, ..., translators is that you want to save mails before sending them, so you can't edit directly into the translator&lt;br>
&lt;j4v4m4n> manuel, may be we want a simpler one, all of us are beginners except AB&lt;br>
@@ -264,11 +266,10 @@ IRC Logs about the discussion on #hurd
&lt;j4v4m4n> bye
&lt;kilobug> bye j4v4m4n
-&lt;/code>&lt;/pre>
+</code></pre>
## Interesting??
Join the project -- Add yourself to the list below
[[Praveen A]]
--- PraveenA - 13 May 2006
->>>>>>> 5e7b26e9e3ac1f7b16e914507e3f1738cf58a64c:emailfs.mdwn
+-- PraveenA - 13 May 2006 \ No newline at end of file