[deployment-guide/comm-rel: 10/727] fix BookInfo

[Jaromir Hradilek]

commit b0bf900e8b12630a677171ec2d87354b4a79f42a
Author: Martin Prpic <mprpic at redhat.com>
Date:   Fri Jun 11 12:56:41 2010 +0200

    fix BookInfo

 en-US/Book_Info.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index 93513dc..d676d61 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -5,15 +5,15 @@
   <title>Deployment Guide</title>
   <subtitle>Deployment, configuration and administration of &MAJOROSVER;</subtitle>
   <productname>Red Hat Enterprise Linux</productname>
-<<<<<<< HEAD
-  <productnumber>&VERSIONNUM;</productnumber>
+
+  <productnumber>6</productnumber>
   <edition>0.1</edition>
-  <pubsnumber>7</pubsnumber>
-=======
+  <pubsnumber>8</pubsnumber>
+
   <productnumber>6</productnumber>
   <edition>0.5</edition>
   <pubsnumber>1</pubsnumber>
->>>>>>> acc1c0b1958019074217ac99bbffefce34820e38
+
   <abstract>
     <para>The Deployment Guide documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;.</para>
   </abstract>