Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed merge conflict

  • Loading branch information...
commit e545c98f5cfb9b208b15484e48577de224467089 2 parents 358f2cd + e99f96c
Derek Gathright authored
Showing with 1 addition and 1 deletion.
  1. +0 −1  bin/milo
  2. +1 −0  utils.js
1  bin/milo
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'),
1  utils.js
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 () {
Please sign in to comment.
Something went wrong with that request. Please try again.