[selinux-policy: 4/7] Update from upstream

[Daniel J Walsh]

commit 0608169181a6b1b372204d7a48df36a998bfbbc7
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Tue Jan 15 11:55:13 2013 -0500

    Update from upstream

 selinux-policy.spec |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 48e08c1..01824b3 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -13,16 +13,8 @@
 %if %{?BUILD_MLS:0}%{!?BUILD_MLS:1}
 %define BUILD_MLS 1
 %endif
-<<<<<<< HEAD
-%define POLICYVER 29
-%define POLICYCOREUTILSVER 2.1.13-34
-||||||| merged common ancestors
-%define POLICYVER 28
-%define POLICYCOREUTILSVER 2.1.13-34
-=======
 %define POLICYVER 29
 %define POLICYCOREUTILSVER 2.1.13-53
->>>>>>> fa970c32f1409d9b0322c292f1e89b2028368e3b
 %define CHECKPOLICYVER 2.1.11-3
 Summary: SELinux policy configuration
 Name: selinux-policy