Index: bp-activity/feeds/bp-activity-favorites-feed.php
--- bp-activity/feeds/bp-activity-favorites-feed.php Base (BASE)
+++ bp-activity/feeds/bp-activity-favorites-feed.php Locally Modified (Based On LOCAL)
@@ -12,8 +12,7 @@

 header('Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
 header('Status: 200 OK');
-?>
-<?php echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?'.'>'; ?>

 <rss version="2.0"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
Index: bp-activity/feeds/bp-activity-friends-feed.php
--- bp-activity/feeds/bp-activity-friends-feed.php Base (BASE)
+++ bp-activity/feeds/bp-activity-friends-feed.php Locally Modified (Based On LOCAL)
@@ -12,8 +12,7 @@

 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
 header('Status: 200 OK');
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

 <rss version="2.0"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
Index: bp-activity/feeds/bp-activity-group-feed.php
--- bp-activity/feeds/bp-activity-group-feed.php Base (BASE)
+++ bp-activity/feeds/bp-activity-group-feed.php Locally Modified (Based On LOCAL)
@@ -12,8 +12,7 @@

 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
 header('Status: 200 OK');
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

 <rss version="2.0"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
Index: bp-activity/feeds/bp-activity-mentions-feed.php
--- bp-activity/feeds/bp-activity-mentions-feed.php Base (BASE)
+++ bp-activity/feeds/bp-activity-mentions-feed.php Locally Modified (Based On LOCAL)
@@ -12,8 +12,7 @@

 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
 header('Status: 200 OK');
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

 <rss version="2.0"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
Index: bp-activity/feeds/bp-activity-mygroups-feed.php
--- bp-activity/feeds/bp-activity-mygroups-feed.php Base (BASE)
+++ bp-activity/feeds/bp-activity-mygroups-feed.php Locally Modified (Based On LOCAL)
@@ -12,8 +12,7 @@

 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
 header('Status: 200 OK');
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

 <rss version="2.0"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
Index: bp-activity/feeds/bp-activity-personal-feed.php
--- bp-activity/feeds/bp-activity-personal-feed.php Base (BASE)
+++ bp-activity/feeds/bp-activity-personal-feed.php Locally Modified (Based On LOCAL)
@@ -12,8 +12,7 @@

 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
 header('Status: 200 OK');
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

 <rss version="2.0"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
Index: bp-activity/feeds/bp-activity-sitewide-feed.php
--- bp-activity/feeds/bp-activity-sitewide-feed.php Base (BASE)
+++ bp-activity/feeds/bp-activity-sitewide-feed.php Locally Modified (Based On LOCAL)
@@ -12,8 +12,7 @@

 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
 header('Status: 200 OK');
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

 <rss version="2.0"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"