From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Sep 2008 18:52:15 +0000 (+0200)
Subject: Fix merge diff.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=165d05663f7b3c22e16a367cf93c691a656c6ed4;p=ipfire.org.git

Fix merge diff.
---

diff --git a/www/en/index.shtml b/www/en/index.shtml
index 5387ec4d..b0dcb4cd 100644
--- a/www/en/index.shtml
+++ b/www/en/index.shtml
@@ -46,7 +46,7 @@
 					</ul>
 
 					<p>
-						<b>ear Community!</b><br />
+						<b>Dear Community!</b><br />
 						It is almost a year ago, we´ve finalized the 2.1 and started the BETA process for
 						the final release. After two hard months 2.1 was released in november 2007. Here are
 						some very interisting numbers to show the growing interest for IPFire and its ongoing
diff --git a/www/en/news.shtml b/www/en/news.shtml
index 0c288829..a013e942 100644
--- a/www/en/news.shtml
+++ b/www/en/news.shtml
@@ -34,7 +34,7 @@
 					</ul>
 
 					<p>
-						<b>ear Community!</b><br />
+						<b>Dear Community!</b><br />
 						It is almost a year ago, we´ve finalized the 2.1 and started the BETA process for
 						the final release. After two hard months 2.1 was released in november 2007. Here are
 						some very interisting numbers to show the growing interest for IPFire and its ongoing