Permalink
Browse files

edited conflict

  • Loading branch information...
1 parent fd48883 commit 03927a98a40b025eb8315679248c01baefffb1ca Pierre-Michel MG @ Nurun committed Mar 20, 2012
Showing with 1 addition and 6 deletions.
  1. +1 −6 index.js
View
7 index.js
@@ -1,6 +1 @@
-<<<<<<< HEAD
-module.exports = require("./lib");
-=======
-exports.dali = require(__dirname +"/lib/dali").dali;
-exports.compile = require(__dirname +"/lib/dali").compile;
->>>>>>> add module index
+module.exports = require("./lib");

0 comments on commit 03927a9

Please sign in to comment.