[gnome-shell] tests: Fix borders test

[Jasper St. Pierre <jstpierre src gnome org>]

commit 114fb4219b0fff7de167d572a37b00be76b479f3
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Sat Jul 28 05:44:35 2012 -0300

    tests: Fix borders test
    
    Bad merge
    
    https://bugzilla.gnome.org/show_bug.cgi?id=680801

 tests/interactive/borders.js |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index 0e27058..97d049d 100644
--- 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;'