hidden file fixes

This commit is contained in:
Curt Hash 2009-10-05 11:09:34 -06:00
parent 90da0baaa1
commit 9ed4a6866e
4 changed files with 3 additions and 7 deletions

View File

@ -10,11 +10,7 @@ print '''
<html> <html>
<head> <head>
<title>1</title> <title>1</title>
<<<<<<< HEAD:puzzles/webapp/1/1.cgi
<link rel="stylesheet" type="text/css" href="ctf.css" media="all" />
=======
<link rel="stylesheet" type="text/css" href=",ctf.css" media="all" /> <link rel="stylesheet" type="text/css" href=",ctf.css" media="all" />
>>>>>>> 3c3c03775e5ac9a11abf581fbf8656e31d99ef42:puzzles/webapp/1/1.cgi
<!-- key = ktFfb8R1Bw --> <!-- key = ktFfb8R1Bw -->
</head> </head>
<body> <body>

View File

@ -14,7 +14,7 @@ print '''
<html> <html>
<head> <head>
<title>2</title> <title>2</title>
<link rel="stylesheet" type="text/css" href="ctf.css" media="all" /> <link rel="stylesheet" type="text/css" href=",ctf.css" media="all" />
</head> </head>
<body> <body>
<div id="wrapper"> <div id="wrapper">

View File

@ -14,7 +14,7 @@ print '''
<html> <html>
<head> <head>
<title>3</title> <title>3</title>
<link rel="stylesheet" type="text/css" href="ctf.css" media="all" /> <link rel="stylesheet" type="text/css" href=",ctf.css" media="all" />
</head> </head>
<body> <body>
<div id="wrapper"> <div id="wrapper">

View File

@ -17,7 +17,7 @@ print '''
<html> <html>
<head> <head>
<title>4</title> <title>4</title>
<link rel="stylesheet" type="text/css" href="ctf.css" media="all" /> <link rel="stylesheet" type="text/css" href=",ctf.css" media="all" />
</head> </head>
<body> <body>
<div id="wrapper"> <div id="wrapper">