summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeval Shah <[email protected]>2018-11-09 22:02:02 -0800
committerDeval Shah <[email protected]>2018-11-09 22:02:02 -0800
commitb7a6f01848a35f777111dfb8e4a508ccb8f4739d (patch)
treebc0a45effe5ffe89fa5b60cf8ca86b3dc38f8d1a
parent5d5fe709aeedcff0203b230ddf3a353e8221c03b (diff)
resolving merge conflict
-rw-r--r--aerialvision/organizedata.py2
1 files changed, 1 insertions, 1 deletions
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..."