From b7a6f01848a35f777111dfb8e4a508ccb8f4739d Mon Sep 17 00:00:00 2001 From: Deval Shah Date: Fri, 9 Nov 2018 22:02:02 -0800 Subject: resolving merge conflict --- aerialvision/organizedata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aerialvision/organizedata.py b/aerialvision/organizedata.py index 090b90f..0d6cd91 100644 --- a/aerialvision/organizedata.py +++ b/aerialvision/organizedata.py @@ -97,7 +97,7 @@ def organizedata(fileVars): 'sparse':OrganizeSparse, # Vector data with 2D index (used by DRAM access stats) 'custom':0 } - data_type_char = {int:'I', float:'f'} + data_type_char = {int:'I', float:'f'} print "Organizing data into internal format..." -- cgit v1.3