From 114fb4219b0fff7de167d572a37b00be76b479f3 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 28 Jul 2012 05:44:35 -0300
Subject: [PATCH] tests: Fix borders test

Bad merge

https://bugzilla.gnome.org/show_bug.cgi?id=680801
---
 tests/interactive/borders.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index 0e27058c5..97d049d50 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;'