aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-11 17:46:58 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-11 17:46:58 -0700
commit5386686a1e0e60623d6421cbd85a93814c74fb58 (patch)
tree8fcdb93305e6b32d50f6f06c9cba7ca964a6304a /mod
parentaceb7ae8e96ec5453f182c39a98acec64a6b3d6d (diff)
downloadvolse-hubzilla-5386686a1e0e60623d6421cbd85a93814c74fb58.tar.gz
volse-hubzilla-5386686a1e0e60623d6421cbd85a93814c74fb58.tar.bz2
volse-hubzilla-5386686a1e0e60623d6421cbd85a93814c74fb58.zip
missing merge conflict
Diffstat (limited to 'mod')
-rw-r--r--mod/mitem.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/mod/mitem.php b/mod/mitem.php
index a95487e37..9a80ba88b 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -230,13 +230,8 @@ function mitem_content(&$a) {
'$aclselect' => populate_acl($mitem,false),
'$mitem_id' => intval(argv(2)),
'$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'),
-<<<<<<< HEAD
- '$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'),
+ '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-name"'),
'$usezid' => array('usezid', t('Use Hubzilla magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''),
-=======
- '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),
- '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''),
->>>>>>> 2cb8b19972eb6a023eca1297f281ef9f68934c64
'$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''),
'$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')),
'$submit' => t('Submit'),