From 6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57 Mon Sep 17 00:00:00 2001
From: Clipperz <info@clipperz.com>
Date: Wed, 09 Jan 2013 11:24:13 +0000
Subject: Merge branch 'master' of github.com:clipperz/password-manager

Conflicts:
	frontend/beta/css/yui-extensions/basic-dialog.css
---
(limited to 'frontend/beta/css/yui-extensions/basic-dialog.css')

diff --git a/frontend/beta/css/yui-extensions/basic-dialog.css b/frontend/beta/css/yui-extensions/basic-dialog.css
index 2b1e20c..5a6cefb 100644
--- a/frontend/beta/css/yui-extensions/basic-dialog.css
+++ b/frontend/beta/css/yui-extensions/basic-dialog.css
@@ -24,7 +24,10 @@ refer to http://www.clipperz.com.
 */
 
 .ydlg-proxy {
+<<<<<<< HEAD
 	background-image: url(./images/default/gradient-bg.gif);
+=======
+>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
 	background-color:#c3daf9;
 	border:1px solid #6593cf;
 	z-index:10001;
@@ -93,7 +96,10 @@ body.masked .ydlg select {
 	padding-right:3px;
 }
 .ydlg .ydlg-dlg-body{
+<<<<<<< HEAD
 	background:url(./images/default/layout/gradient-bg.gif);
+=======
+>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
 	border:1px solid #6593cf;
 	border-top:0 none;
 	padding:10px;
--
cgit v0.9.0.2