Changeset 1279551

Timestamp:

11/04/2015 02:52:48 PM (10 years ago)

Author:

desirelabs

Message:

update readme

Location:

desire-page-widget/trunk

Files:

• README.txt (modified) (1 diff)
• README.txt.orig (copied) (copied from desire-page-widget/trunk/README.txt) (2 diffs)

desire-page-widget/trunk/README.txt

@@ -1 +1 @@
 === Desire Page Widget ===
+
 Contributors: franck
 Tags: page, widget, single page, one page, layout

desire-page-widget/trunk/README.txt.orig

@@ -16 +16 @@
 Upload the Desire Page Widget plugin to your wp-content/plugins/ blog folder, then activate it.
 
+<<<<<<< HEAD
 * Go to appearance/widgets in your admin menu
 * Add a Desire Page Widget in the freshly created Desire Widget Sidebar
@@ -21 +22 @@
 * Name to your widget (usually a name related to the page you're including)
 * Copy and paste the shortcode [desire_widget_sidebar] into the content you want the sidebar to show up, a page or a post for example
+=======
+Go to appearance/widgets in your admin menu
+Add a Desire Page Widget in the freshly created Desire Widget Sidebar
+Select in the list the page you want to display
+Name to your widget (usualy a name related to the page you're including)
+Copy and paste the shortcode [desire_widget_sidebar] into the content you want the sidebar to show up, a page or a post for example
+>>>>>>> 82b112fdd41578c018ed715d02eaf52ccfd603c1
 
 done!