joomla/weblinks
30
1
Fork 0
mirror of https://github.com/joomla-extensions/weblinks.git synced 2024-06-01 05:50:52 +00:00
Code Issues Releases Activity

Update config.xml

Browse Source 
deleted merge conflict hints.
This commit is contained in:
Astrid 2017-09-16 18:36:25 +02:00 committed by GitHub
parent 8b9ab398a9
commit e69347e255
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/administrator/components/com_weblinks/config.xml
View File

@ -411,7 +411,6 @@
<option value="1">JSHOW</option> <option value="1">JSHOW</option>
<option value="0">JHIDE</option> <option value="0">JHIDE</option>
</field> </field>
<<<<<<< HEAD
<field <field
name="custom_fields_enable" name="custom_fields_enable"
@ -424,8 +423,6 @@
<option value="1">JYES</option> <option value="1">JYES</option>
<option value="0">JNO</option> <option value="0">JNO</option>
</field> </field>
=======
>>>>>>> e8a9d563afa331e4975832959b0f19826a66b793
</fieldset> </fieldset>
<fieldset <fieldset