FDSU-1851: Fixing syntax errors.

uw_virtual_site_homepage.features.field_base.inc

@@ -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(

uw_virtual_site_homepage.features.field_instance.inc

@@ -1001,7 +1001,6 @@ function uw_virtual_site_homepage_field_default_field_instances() {
       'module' => 'og',
       'settings' => array(),
       'type' => 'og_complex',
-<<<<<<< HEAD
       'weight' => 10,
     ),
   );