fixing merge conflicts

1 files changed, 0 insertions, 188 deletions

diff --git a/static/trash/main.css b/static/trash/main.css
deleted file mode 100755
index b3eef67..0000000
--- a/static/trash/main.css
+++ /dev/null
@@ -1,188 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-
-#apDiv2 {
-	position:relative;
-	top:100px;
-	width:700px;
-	margin: 0px auto -1px auto;
-	height: 300px;
-	z-index: 3;
-}
-#info {
-	position:relative;
-	top:200px;
-	width:700px;
-	margin: 0px auto -1px auto;
-	height: 14px;
-	color: #999;
-	bottom:0px;
-	z-index: 3;	
-}
-
-#front {
-	position:fixed;
-	top:150px;
-}
-#infopage {		
-	margin: 0px auto -1px auto;
-	height: 14px;
-	color: #999;
-	bottom:0px;
-	z-index: 3;
-	font-size: 10px;
-
-	font-size: 12px;
-	letter-spacing: 1px;
-	bottom: 0px;
-}
-#signin {
-	position:absolute;
-	left:0px;
-	width:410px;
-	height:281px;
-	
-	z-index:3;
-	
-}
-#signinbg {
-	position:absolute;
-	left:0px;
-	width:410px;
-	height:281px;
-	background-image: url(logbg.png);
-	z-index:1;	
-}
-#about {
-	position:absolute;
-	width:300px;
-	height: 230px;
-	left:410px;
-	line-height: 18px;
-	padding-left: 20px;
-	;
-	font-weight: bold;
-	color: #000;
-	z-index:2;
-	top: 177px;
-}
-#input {
-	padding-right:15px;
-	line-height:28px;
-	font-size: 24px;
-	font-weight: bolder;
-}
-body,td,th {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	line-height: 40px;
-}
-#apDiv1 div #input #form1 label {
-	font-size: 12px;
-	color: #333;
-}
-.re {
-	font-size: 10px;
-}
-#apDiv2 #about div {
-	font-size: 10px;
-	color: #424143;
-}
-#top {
-	position:absolute;
-	left:0px;
-	top:0px;
-	width:100%;
-	height:32px;
-	z-index:2;
-	background-color: #CCC;
-}
-#apDiv3 {
-	position:fixed;
-	left:0px;
-	top:0px;
-	width:68px;
-	height:68px;
-	background-image: url(topl.png);
-}
-#apDiv4 {
-	position:fixed;
-	top:0px;
-	width:68px;
-	height:68px;
-	
-	right: 0px;
-	background-image: url(topr.png);
-}
-#bottom {
-	position:absolute;
-	left:0px;
-	bottom:0px;
-	width:100%;
-	height:10px;
-	z-index:1;
-	font-size: 10px;
-	line-height: 5px;
-}
-#apDiv5 {
-	position:fixed;
-	bottom:0px;
-	width:60px;
-	height:68px;
-	
-	left: 0px;
-	background-image: url(bottoml.png);
-}
-#apDiv6 {
-	position:fixed;
-	bottom:0px;
-	width:60px;
-	height:68px;
-	
-	right: 0px;
-	background-image: url(bottomr.png);
-}
-#bg {
-	position:absolute;
-	left:0px;
-	top:0px;
-	width:100%;
-	height:100%;
-	z-index:2;
-	background-image:url(grad2.jpg);
-}
-body {
-	background-image: url(bg4.png);
-	background-repeat: repeat-x;
-	background-attachment:fixed;
-}
-#plane {
-	position:fixed;
-	top:9px;
-	right:0px;
-	width:100%;
-	height:100%;
-	z-index:1;
-	background-image: url(cloudbg1.png);
-	background-repeat: no-repeat;
-	background-position:center;
-	
-
-}
-#registerbox {
-	padding-left:20px;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	padding-right:85px;
-	line-height:28px;
-}
-.form {  font-size: 14px; color="#990000"; }
-.info {
-	font-size: 10px;
-}
-.info {
-	font-size: 12px;
-	letter-spacing: 1px;
-	bottom: 0px;
-	color: #999;
-}