From 4d97ea106cf45f9dd191358dc6bde3a7fab438c1 Mon Sep 17 00:00:00 2001
From: Haakon Meland Eriksen <haakon.eriksen@far.no>
Date: Sun, 29 Nov 2015 11:55:39 +0100
Subject: Resolving merge conflict

---
 include/datetime.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'include/datetime.php')

diff --git a/include/datetime.php b/include/datetime.php
index 952151a00..1d10e7ad7 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -235,11 +235,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
 	$o .= replace_macros($tpl,array(
 			'$field' => array($id, $label, $input_text, (($required) ? t('Required') : ''), (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'),
 		));
-<<<<<<< HEAD
-	$o .= "<script>\$(function () {var picker = \$('#id_$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>";
-=======
 	$o .= "<script>\$(function () {var picker = \$('#id_$id').datetimepicker({step:15,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>";
->>>>>>> upstream/master
 
 	return $o;
 }
-- 
cgit v1.2.3