maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

clean up merge conflict message

Browse source
This commit is contained in:
Joe Fleming 2015-11-03 13:20:14 -07:00
parent 4a114188d7
commit 1213afe38d
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/support/pages/SettingsPage.js
View file

@ -228,10 +228,6 @@ define(function (require) {
return button.click();
});
}
<<<<<<< HEAD
=======
>>>>>>> 24da64f... No code changes, only style change to unwrap a lot of superfluous line breaks on chained calls.
};
return SettingsPage;