From: Adam Magness Date: Wed, 24 Jan 2018 03:03:57 +0000 (-0500) Subject: Avoid branch conflict X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c28f886179d52a194be24c129c7bc93d647d88c0;p=friendica.git Avoid branch conflict --- diff --git a/include/datetime.php b/include/datetime.php index cbfc9b6d23..53455d4557 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -201,12 +201,6 @@ function dob($dob) ] ]); - /// @TODO Old-lost code? - // if ($dob && $dob > '0001-01-01') - // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year), 'dob'); - // else - // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob'); - return $o; }