Changeset 377556

Timestamp:

04/26/2011 10:02:08 PM (15 years ago)

Author:

anabelle

Message:

fix readme conflict

File:

• custom-menu-images/trunk/readme.txt (modified) (5 diffs)

custom-menu-images/trunk/readme.txt

@@ -4 +4 @@
 Tags: nav_menus, images, custom images, icons, thumbnails, background, media gallery, upload, custom menu, item image
 Requires at least: 3.0
-<<<<<<< .mine
 Tested up to: 3.1.2
 Stable tag: 0.8
-=======
-Tested up to: 3.0.3
-Stable tag: 0.5
->>>>>>> .r377551
 
 Adds an image field to all menu items and generates CSS, for user side background image manipulation.
@@ -20 +15 @@
 It can be used to set thumbnails and make mega-dropdowns, or to add a custom icon to each menu item 
 
-<<<<<<< .mine
 Once configured by the developer, the administrator can easily change each image without touching a line of code.
-=======
-It wont look nice out of the box, it is intended for developers who want extra functionality in the menu.
->>>>>>> .r377551
 
 It wont always look nicely out of the box (actually it never does), it is intended for developers who want extra functionality in the menu.
@@ -56 +47 @@
 == Changelog ==
 
-<<<<<<< .mine
 = 0.8 =
 * Multiple menus now supported
@@ -62 +52 @@
 
 = 0.5 =
-* Now supports choosing of image size to add
-
-=======
-= 0.5 =
 * Fixed some bugs to allow selection of image size from Media Library ("Thumbnai", "Medium", "Large", "Original Size").
 
->>>>>>> .r377551
 = 0.2 =
 * Initial release
@@ -75 +60 @@
 == Upgrade Notice ==
 
-<<<<<<< .mine
 = 0.8 =
 It is getting better, Still testing.
 
-=======
 = 0.5 =
 If you want to choose the image size to use and not just thumbnail, this update is for you.
 
->>>>>>> .r377551
 = 0.2 =
 Initial release, come on and help us test it!