Repository :
http://git.fedorahosted.org/git/?p=docs/uefi-secure-boot-guide.git
On branch : master
---------------------------------------------------------------
commit 02cc55975a5a744b3221d8f53c01e43bbf89580b
Author: Eric Christensen <sparks(a)fedoraproject.org>
Date: Fri Feb 1 17:03:47 2013 -0500
Removed merge marks
---------------------------------------------------------------
en-US/Implementation_of_Secure_Boot.xml | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/en-US/Implementation_of_Secure_Boot.xml
b/en-US/Implementation_of_Secure_Boot.xml
index 1ca8378..4365fd3 100644
--- a/en-US/Implementation_of_Secure_Boot.xml
+++ b/en-US/Implementation_of_Secure_Boot.xml
@@ -37,11 +37,7 @@ contains the public key used to sign kerenl modules.
</para>
<para>
Kernel Modules: These are signed with a private key generated
-<<<<<<< HEAD
-during build. This key is not saved, a new key is used with each Kernel
-=======
during build. This key is not saved, a new key is used with each kernel
->>>>>>> bressers
build.
</para>
<para>