[Pkg-javascript-commits] [less.js] 254/285: fix merge

[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 990a1a3d0fbd5e963d18f628fd671b9de1a6707c
Author: Luke Page <luke.a.page at gmail.com>
Date:   Sat Nov 1 18:52:21 2014 +0000

    fix merge
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 518426c..5b5701a 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "grunt-shell": "~1.1.1",
     "grunt-browserify": "~3.1.0",
     "matchdep": "~0.3.0",
-    "time-grunt": "~1.0.0"
+    "time-grunt": "~1.0.0",
     "grunt-saucelabs": "~8.3.2"
   },
   "keywords": [

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