Built production version

src/static/stats.txt

@@ -1,34 +1,20 @@
 202	source files
-<<<<<<< HEAD
-104240	lines
+104241	lines
 	size
 
 136	JavaScript source files
-95168	lines
+95169	lines
 3.5M	size
-=======
-104191	lines
-4.0M	size
-
-136	JavaScript source files
-95119	lines
-3.4M	size
->>>>>>> upstream/master
 
 78	third party JavaScript source files
 76377	lines
 2.8M	size
 
 58	first party JavaScript source files
-<<<<<<< HEAD
-18791	lines
+18792	lines
 736K	size
-=======
-18742	lines
-724K	size
->>>>>>> upstream/master
 
-3.1M	uncompressed JavaScript size
+3.2M	uncompressed JavaScript size
 1.7M	compressed JavaScript size
 
 15	categories