tests: Fix borders test

Bad merge https://bugzilla.gnome.org/show_bug.cgi?id=680801
2012-07-28 05:44:35 -03:00 · 2012-07-28 05:44:35 -03:00 · 114fb4219b
commit 114fb4219b
parent 4d7d66bc1f
1 changed files with 0 additions and 1 deletions
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@ -84,7 +84,6 @@ function test() {
    function addGradientCase(direction, borderWidth, borderRadius, extra) {
        let gradientBox = new St.BoxLayout({ style_class: 'background-gradient',
                                             style: 'border: ' + borderWidth + 'px solid #8b0000;'
->>>>>>> 2aff593... tests: Run each test in a function
                                             + 'border-radius: ' + borderRadius + 'px;'
                                             + 'background-gradient-direction: ' + direction + ';'
                                             + 'width: 32px;'