updating built files after version bump

medialize · Aug 31, 2014 · f2480fc · f2480fc
1 parent 7244169
commit f2480fc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/dist/sass.js b/dist/sass.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/*! sass.js - v0.4.0 - 2014-06-06 */
-=======
-/*! sass.js - v0.0.0 - 2014-08-31 */
->>>>>>> master
+/*! sass.js - v0.5.0 - 2014-08-31 */
 (function (root, factory) {
   'use strict';
   if (typeof define === 'function' && define.amd) {

diff --git a/dist/sass.worker.js b/dist/sass.worker.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/*! sass.js - v0.4.0 - web worker - 2014-06-06 */(function (root, factory) {
-=======
-/*! sass.js - v0.0.0 - web worker - 2014-08-31 */(function (root, factory) {
->>>>>>> master
+/*! sass.js - v0.5.0 - web worker - 2014-08-31 */(function (root, factory) {
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.

diff --git a/dist/worker.js b/dist/worker.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/*! sass.js - v0.4.0 - web worker - 2014-06-06 */'use strict';
-=======
-/*! sass.js - v0.0.0 - web worker - 2014-08-31 */'use strict';
->>>>>>> master
+/*! sass.js - v0.5.0 - web worker - 2014-08-31 */'use strict';
 /*global Sass, postMessage, onmessage:true, importScripts*/
 importScripts('sass.min.js');
 

diff --git a/dist/worker.min.js b/dist/worker.min.js