clean up merge conflict message
This commit is contained in:
parent
4a114188d7
commit
1213afe38d
1 changed files with 0 additions and 4 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue