From 43e7261accac3ecff3a194cc0479d2db8f607b2e Mon Sep 17 00:00:00 2001
From: hanakin <midaym@gmail.com>
Date: Sun, 30 Apr 2017 10:48:14 -0400
Subject: [PATCH] [ticket/14131] Fix rebase conflict

PHPBB3-14131
---
 phpBB/styles/prosilver/theme/colours.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 89111b1e78..28ce9f89fc 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -996,9 +996,9 @@ fieldset.fields2 dl:hover dt label {
 .inputbox:-moz-placeholder,
 .inputbox::-webkit-input-placeholder {
 	color: #212121;
-.inputbox:hover,
 }
 
+.inputbox:hover,
 .inputbox:focus {
 	border-color: #13a4ec;
 }