Skip to content

Commit

Permalink
Fixing merge conflict resolution I botched initially
Browse files Browse the repository at this point in the history
  • Loading branch information
briantq committed Sep 29, 2018
1 parent bb01218 commit 7e8fede
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/android/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function addRepos(buildGradle) {
// modify the line to add the necessary repo
// Crashlytics goes under buildscripts which is the first grouping in the file
var fabricMavenRepo = whitespace + 'maven { url \'https://maven.fabric.io/public\' } // Fabrics Maven repository from cordova-plugin-firebase'
var modifiedLine = match[0] + '\n' + googlesMavenRepo + '\n' + fabricMavenRepo;
var modifiedLine = match[0] + '\n' + fabricMavenRepo;

// modify the actual line
buildGradle = buildGradle.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
Expand Down

0 comments on commit 7e8fede

Please sign in to comment.