[Pkg-javascript-commits] [less.js] 58/285: Fix merge errors and node tests

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag v2.0.0
in repository less.js.

commit ddba05546185ca57911779eff5a2f4a28590cd86
Author: Luke Page <luke.a.page at gmail.com>
Date:   Thu Aug 14 18:03:59 2014 +0100

    Fix merge errors and node tests
---
 lib/less/tree/element.js   | 1 +
 test/css/import-inline.css | 2 +-
 test/sourcemaps/basic.json | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/less/tree/element.js b/lib/less/tree/element.js
index 3b5a6a7..925b4b9 100644
--- a/lib/less/tree/element.js
+++ b/lib/less/tree/element.js
@@ -42,3 +42,4 @@ Element.prototype = {
     }
 };
 return Element;
+};
diff --git a/test/css/import-inline.css b/test/css/import-inline.css
index 5e729d1..6e95689 100644
--- a/test/css/import-inline.css
+++ b/test/css/import-inline.css
@@ -1,5 +1,5 @@
 #import {
-  color: #ff0000;
+  color: red;
 }
 @media (min-width: 600px) {
   #css { color: yellow; }
diff --git a/test/sourcemaps/basic.json b/test/sourcemaps/basic.json
index e548ead..51372f3 100644
--- a/test/sourcemaps/basic.json
+++ b/test/sourcemaps/basic.json
@@ -1 +1 @@
-{"version":3,"sources":["testweb/sourcemaps/basic.less","testweb/sourcemaps/imported.css"],"names":[],"mappings":"AAMA;EACE,YAAA;EAJA,UAAA;EAWA,iBAAA;EALA,WAAA;EACA,mBAAA;;AAJF,EASE;AATF,EASM;EACF,gBAAA;;AACA,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFA;AAEF,EAFE,GAEA,KAFJ;AAEE,EAFE,GAEA,KAFA;EAGA,UAAA;;AALN;AAAI;AAUJ;EATE,iBAAA;;AADF,EAEE;AAFE,EAEF;AAFF,EAEM;AAFF,EAEE;AAQN,OARE;AAQF,OARM;EACF,gBAAA;;AACA,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFA;AAEF,EAFF,GAEI,KAFA;AAEF,EAFF,GAEI,KAF [...]
\ No newline at end of file
+{"version":3,"sources":["testweb/sourcemaps/basic.less","testweb/sourcemaps/imported.css"],"names":[],"mappings":"AAMA;EACE,YAAA;EAJA,UAAA;EAWA,iBAAA;EALA,WAAA;EACA,iBAAA;;AAJF,EASE;AATF,EASM;EACF,gBAAA;;AACA,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFA;AAEF,EAFE,GAEA,KAFJ;AAEE,EAFE,GAEA,KAFA;EAGA,UAAA;;AALN;AAAI;AAUJ;EATE,iBAAA;;AADF,EAEE;AAFE,EAEF;AAFF,EAEM;AAFF,EAEE;AAQN,OARE;AAQF,OARM;EACF,gBAAA;;AACA,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFJ;AAEE,EAFF,GAEI,KAFA;AAEF,EAFF,GAEI,KAFA;AAEF,EAFF,GAEI,KAF [...]
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/less.js.git