Permalink
Browse files

Fixed merge conflict

  • Loading branch information...
2 parents 358f2cd + e99f96c commit e545c98f5cfb9b208b15484e48577de224467089 @derek committed Jul 21, 2012
Showing with 1 addition and 1 deletion.
  1. +0 −1 bin/milo
  2. +1 −0 utils.js
View
@@ -1,6 +1,5 @@
#!/usr/bin/env node
/*jslint nomen:true sloppy:true white:true node:true*/
-
var optimist = require('optimist'),
fs = require('fs'),
path = require('path'),
View
@@ -33,6 +33,7 @@ function getAsset (library, file) {
var miloPath = this.miloPath;
return require('fs').readFileSync(miloPath + 'libraries/' + library + '/assets/' + file, 'utf-8');
+
}
function getUtilityMap () {

0 comments on commit e545c98

Please sign in to comment.