Fixing error caused by merge commit

This commit is contained in:
Joe Bowser 2017-07-31 14:10:14 -07:00
parent 46905ebe99
commit e91b19d006

View File

@ -200,7 +200,7 @@ function updateProjectAccordingTo (platformConfig, locations) {
.write(); .write();
// Java file paths shouldn't be hard coded // Java file paths shouldn't be hard coded
var javaPattern = path.join(locations.javaSrc, orig_pkg.replace(/\./g, '/'), '*.java'); var javaPattern = path.join(locations.javaSrc, manifestId.replace(/\./g, '/'), '*.java');
var java_files = shell.ls(javaPattern).filter(function (f) { var java_files = shell.ls(javaPattern).filter(function (f) {
return shell.grep(/extends\s+CordovaActivity/g, f); return shell.grep(/extends\s+CordovaActivity/g, f);
}); });