Commit c4963e1e authored by Eric Bremner's avatar Eric Bremner
Browse files

FDSU-1851: Fixing syntax errors.

parent 38122561
......@@ -154,6 +154,7 @@ function uw_virtual_site_homepage_field_default_field_bases() {
),
'translatable' => 0,
'type' => 'image',
);
// Exported field_base: 'field_uw_faculty_list'
$field_bases['field_uw_faculty_list'] = array(
......
......@@ -1001,7 +1001,6 @@ function uw_virtual_site_homepage_field_default_field_instances() {
'module' => 'og',
'settings' => array(),
'type' => 'og_complex',
<<<<<<< HEAD
'weight' => 10,
),
);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment