diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:28:51 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:28:51 +0100 |
| commit | 5cb10548b30544c0407294fa7e520479673f956c (patch) | |
| tree | 094a823e849e4d34d7e1b6c75b48df5479345c48 /apps | |
| parent | 7aa8eb3427679366905840b80a69e36344a5632d (diff) | |
| download | nextcloud-server-5cb10548b30544c0407294fa7e520479673f956c.tar.gz nextcloud-server-5cb10548b30544c0407294fa7e520479673f956c.zip | |
Resolved conflict
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/contacts/index.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/contacts/index.php b/apps/contacts/index.php index 29c9e4f1219..f4624db31aa 100644 --- a/apps/contacts/index.php +++ b/apps/contacts/index.php @@ -77,7 +77,6 @@ if( !is_null($id)/* || count($contacts)*/){ $details = OC_Contacts_VCard::structureContact($vcard); } -<<<<<<< HEAD // Include Style and Script OC_Util::addScript('contacts','interface'); OC_Util::addStyle('contacts','styles'); @@ -85,13 +84,8 @@ OC_Util::addStyle('contacts','formtastic'); OC_Util::addScript('', 'jquery.multiselect'); OC_Util::addStyle('', 'jquery.multiselect'); -$l10n = new OC_L10N('contacts'); -$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR'); -$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL'); -======= $adr_types = OC_Contacts_App::getTypesOfProperty('ADR'); $phone_types = OC_Contacts_App::getTypesOfProperty('TEL'); ->>>>>>> eeaf539a4414e3081b6f6652167363a3221a1973 // Process the template $tmpl = new OC_Template( 'contacts', 'index', 'user' ); |