Fixed Merge Conflict

adefelicibus · Oct 22, 2013 · cb5c44c · cb5c44c
2 parents f8fea2a + 6688131
commit cb5c44c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/highcharts/chart.py b/highcharts/chart.py
@@ -283,7 +283,7 @@ def set_start_date(self, date):
         """ Set Plot Start Date """
         if isinstance(date, (int, float)):
             date = datetime.datetime.fromtimestamp(date)
-        elif not isinstance(date, datetime):
+        elif not isinstance(date, datetime.datetime):
             error = "Start Date Format Currently Not Supported: %s" % date
             raise HighchartError(error)
         date_dict = {

diff --git a/highcharts/highchart_types.py b/highcharts/highchart_types.py
@@ -223,7 +223,7 @@
 		"size": (int,str),
 		"slicedOffset": int,
 		"startAngle": int,
-		"dataLabels": (dict)
+		"dataLabels": dict,
 	},
 	"scatter": {
 		"allowPointSelect": bool,