updating built files after version bump

rodneyrehm · rodneyrehm · commit f2480fc9886a · 2014-08-31T11:47:45.000+02:00
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
