{"comment":{"url":"https://api.github.com/repos/dimagi/commcare-hq/comments/10848976","html_url":"https://github.com/dimagi/commcare-hq/commit/233a253d217c7a3205cd0d4179b53417f1ce237c#commitcomment-10848976","id":10848976,"user":{"login":"millerdev","id":464726,"avatar_url":"https://avatars.githubusercontent.com/u/464726?v=3","gravatar_id":"","url":"https://api.github.com/users/millerdev","html_url":"https://github.com/millerdev","followers_url":"https://api.github.com/users/millerdev/followers","following_url":"https://api.github.com/users/millerdev/following{/other_user}","gists_url":"https://api.github.com/users/millerdev/gists{/gist_id}","starred_url":"https://api.github.com/users/millerdev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/millerdev/subscriptions","organizations_url":"https://api.github.com/users/millerdev/orgs","repos_url":"https://api.github.com/users/millerdev/repos","events_url":"https://api.github.com/users/millerdev/events{/privacy}","received_events_url":"https://api.github.com/users/millerdev/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":"","commit_id":"233a253d217c7a3205cd0d4179b53417f1ce237c","created_at":"2015-04-22T15:02:55Z","updated_at":"2015-04-22T15:02:55Z","body":"@dannyroberts FYI\r\nNote sure this was the correct resolution for corehq/apps/api/es.py\r\n\r\n```python\r\ndef validate_date(date):\r\n    try:\r\n        datetime.datetime.strptime(date, ISO_DATE_FORMAT)\r\n    except ValueError:\r\n        try:\r\n            datetime.datetime.strptime(date, '%Y-%m-%dT%H:%M:%S')\r\n        except ValueError:\r\n            try:\r\n<<<<<<< HEAD\r\n                datetime.datetime.strptime(date, '%Y-%m-%dT%H:%M:%S.%f')\r\n=======\r\n                date = json_format_datetime(string_to_datetime(date))\r\n>>>>>>> origin/master\r\n            except ValueError:\r\n                raise DateTimeError(\"Date not in the correct format\")\r\n    return date\r\n```\r\n\r\nI kept the change from origin/master"}}