fixing conflict

indiemaps · Sep 27, 2011 · 75d335d · 75d335d
2 parents 4ea3efc + 06e1a98
commit 75d335d
Show file tree

Hide file tree

Showing 27 changed files with 24,485 additions and 0 deletions.
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>hexbin-js</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+</projectDescription>
diff --git a/README b/README
diff --git a/data/json/139309.json b/data/json/139309.json
diff --git a/data/json/crime-data-2000.json b/data/json/crime-data-2000.json
diff --git a/data/json/crime-data-downtown b/data/json/crime-data-downtown
diff --git a/data/json/crime-data-downtown.json b/data/json/crime-data-downtown.json
diff --git a/data/json/crime-data.json b/data/json/crime-data.json
diff --git a/data/json/starbucks_on_earth.json b/data/json/starbucks_on_earth.json
diff --git a/index.html b/index.html
@@ -1 +1,2 @@
+
 cacaw