--- a/lib/FeedWriter/examples/example_rss1.php
+++ b/lib/FeedWriter/examples/example_rss1.php
@@ -1,71 +1,3 @@
-<<<<<<< HEAD
-
- *
- * This file is part of the "Universal Feed Writer" project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-
- include("../FeedTypes.php");
-
- //Creating an instance of RSS1FeedWriter class.
- //The constant RSS1 is passed to mention the version
- $TestFeed = new RSS1FeedWriter();
-
- //Setting the channel elements
- //Use wrapper functions for common elements
- //For other optional channel elements, use setChannelElement() function
- $TestFeed->setTitle('Testing the RSS writer class');
- $TestFeed->setLink('http://www.ajaxray.com/rss2/channel/about');
- $TestFeed->setDescription('This is test of creating a RSS 1.0 feed by Universal Feed Writer');
-
- //It's important for RSS 1.0
- $TestFeed->setChannelAbout('http://www.ajaxray.com/rss2/channel/about');
-
- //Adding a feed. Genarally this protion will be in a loop and add all feeds.
-
- //Create an empty FeedItem
- $newItem = $TestFeed->createNewItem();
-
- //Add elements to the feed item
- //Use wrapper functions to add common feed elements
- $newItem->setTitle('The first feed');
- $newItem->setLink('http://www.yahoo.com');
- //The parameter is a timestamp for setDate() function
- $newItem->setDate(time());
- $newItem->setDescription('This is test of adding CDATA encoded description by the php Universal Feed Writer class');
- //Use core addElement() function for other supported optional elements
- $newItem->addElement('dc:subject', 'Nothing but test');
-
- //Now add the feed item
- $TestFeed->addItem($newItem);
-
- //Adding multiple elements from array
- //Elements which have an attribute cannot be added by this way
- $newItem = $TestFeed->createNewItem();
- $newItem->addElementArray(array('title'=>'The 2nd feed', 'link'=>'http://www.google.com', 'description'=>'This is a test of the FeedWriter class'));
- $TestFeed->addItem($newItem);
-
- //OK. Everything is done. Now genarate the feed.
- $TestFeed->generateFeed();
-
-?>
-=======
printFeed();
->>>>>>> origin/master