From 3e568667fc2d046194335492d2b57127b4e30ad7 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 7 Dec 2012 11:24:25 -0500 Subject: [PATCH] Fix merge badness --- common/lib/xmodule/xmodule/x_module.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index 5009a4e71c..88f4c3c48a 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -435,13 +435,8 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates): # cdodge: this is a list of metadata names which are 'system' metadata # and should not be edited by an end-user -<<<<<<< HEAD system_metadata_fields = ['data_dir', 'published_date', 'published_by', 'is_draft'] - -======= - system_metadata_fields = [ 'data_dir' ] ->>>>>>> origin/master # A list of descriptor attributes that must be equal for the descriptors to # be equal equality_attributes = ('definition', 'metadata', 'location',