Fix merge issue

diff --git a/policy/modules/services/colord.te b/policy/modules/services/colord.te
index 9db8952b5a5a258a4905002b5ff0998fe7e61a5d..246bbf97d6d23a8eec4ddf6ebd49f39750d9c180 100644 (file)
--- a/policy/modules/services/colord.te
+++ b/policy/modules/services/colord.te
@@ -114,7 +114,6 @@ tunable_policy(`use_samba_home_dirs',`
        fs_getattr_cifs(colord_t)
        fs_read_cifs_files(colord_t)
 ')
->>>>>>> 5034724... Add colord_can_network_connect boolean
 
 optional_policy(`
        cups_read_config(colord_t)