merge

reworkcss · Oct 6, 2012 · bde3afc · bde3afc
1 parent 4e5fb7f
commit bde3afc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/Readme.md b/Readme.md
@@ -174,7 +174,6 @@ ul {
 }
 ```
 
-<<<<<<< HEAD
 ### .url(callback)
 
   Map `url()` calls, useful for inlining images as data-uris, converting
@@ -188,7 +187,7 @@ function rewrite(url) {
 rework(str)
   .use(rework.url(rewrite))
   .toString()
-=======
+
 ### .vars()
 
   Add variable support. Note that this does not cascade like the CSS variable

diff --git a/lib/rework.js b/lib/rework.js
@@ -84,8 +84,5 @@ exports.prefixSelectors = require('./plugins/prefix-selectors');
 exports.keyframes = require('./plugins/keyframes');
 exports.opacity = require('./plugins/opacity');
 exports.at2x = require('./plugins/at2x');
-<<<<<<< HEAD
 exports.url = require('./plugins/url');
-=======
 exports.vars = require('./plugins/vars');
->>>>>>> add/vars
diff --git a/test/rework.js b/test/rework.js
@@ -85,7 +85,6 @@ describe('rework', function(){
     })
   })
 
-<<<<<<< HEAD
   describe('.url(fn)', function(){
     it('should map urls', function(){
       function rewrite(url) {
@@ -99,20 +98,21 @@ describe('rework', function(){
     })
   })
 
-  describe('.toString() compress option', function(){
-    it('should compress the output', function(){
-      rework('body { color: red; }')
-        .toString({ compress: true })
-        .should.equal('body{color:red}');
-=======
-  describe.only('.vars()', function(){
+  describe('.vars()', function(){
     it('should add variable support', function(){
       rework(fixture('vars'))
         .vendors(vendors)
         .use(rework.vars())
         .toString()
         .should.equal(fixture('vars.out'));
->>>>>>> add/vars
+    })
+  })
+
+  describe('.toString() compress option', function(){
+    it('should compress the output', function(){
+      rework('body { color: red; }')
+        .toString({ compress: true })
+        .should.equal('body{color:red}');
     })
   })
 })