Resolving conflict

rwaldron · Feb 6, 2012 · 0b003b9 · 0b003b9
2 parents 7d67953 + a7cbde3
commit 0b003b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
-dist/
+*.sublime-*
+dist/
diff --git a/app/public/css/style.css b/app/public/css/style.css
diff --git a/lib/platoon.js b/lib/platoon.js
@@ -1,7 +1,6 @@
 /*! platoon - v0.1.0 - 2/5/2012
 * https://github.com/rwldrn/platoon
 * Copyright (c) 2012 Rick Waldron <waldron.rick@gmail.com>; Licensed MIT */
-
 (function( exports ) {
 
 var // Localize navigator for use within getUserMedia
@@ -186,4 +185,4 @@ var // Localize navigator for use within getUserMedia
   exports.Platoon = Platoon;
   exports.Unit = Unit;
 
-} ( typeof exports === "object" && exports || this ) );
+} ( typeof exports === "object" && exports || this ) );