Changeset 700340

Timestamp:

04/19/2013 02:30:40 PM (11 years ago)

Author:

emirpprime

Message:

Fix initial commit

Location:

pubmed-publist/trunk

Files:

• .gitignore (modified) (1 diff)
• pm_cache.xml (deleted)
• readme.txt (modified) (6 diffs)

pubmed-publist/trunk/.gitignore

@@ -1 +1 @@
 .DS\_Store
-pm_cache.xml

pubmed-publist/trunk/readme.txt

@@ -8 +8 @@
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-<<<<<<< HEAD
 
 Simple shortcode to get and display latest publications from PubMed using a PubMed search URL(s).
 
 
-=======
-Simple shortcode to get and display latest publications from PubMed using a PubMed search URL(s).
-
->>>>>>> Initial Commit
 == Description ==
 
@@ -23 +18 @@
 The shortcode accepts arguments to set how many papers are displayed, apply classes for custom styling, and choose from two layout options.
 
-<<<<<<< HEAD
-=======
-//TODO: Upload to Git + dir and check stable tag.
-//*   Stable tag should indicate the Subversion "tag" of the latest stable version, or "trunk," if you use `/trunk/` for
-stable.
->>>>>>> Initial Commit
 
 = Roadmap =
@@ -37 +26 @@
 * Add JS for show/hide extra results on front-end
 
-<<<<<<< HEAD
 
-=======
->>>>>>> Initial Commit
 == Installation ==
 
@@ -49 +35 @@
 1. Or use `<?php do_shortcode('recentpublications'); ?>` in your templates
 
-<<<<<<< HEAD
 
-=======
->>>>>>> Initial Commit
 == Frequently Asked Questions ==
 
@@ -61 +44 @@
 = Can I contribute to the plugin / suggest a change? =
 
-<<<<<<< HEAD
 Please do! [The project is hosted on GitHub here](http://github.com/emirpprime/PubMedPublist).
 
-=======
-Please do! [The project is hosted on GitHub here](http://github.com/emirpprime/).
->>>>>>> Initial Commit
 
 == Screenshots ==
@@ -75 +54 @@
 1. Settings screen
 
-<<<<<<< HEAD
 
-== Changelog ==
-
-= 0.9.1 =
-* Clean up PHP errors.
-* Migrate Options to an array, it's good manners.
-
-= 0.9 =
-=======
 == Changelog ==
 
 = 0.9 =
 
->>>>>>> Initial Commit
 * Initial Beta Release