머지 충돌 커밋

2013-03-08 12:02:35 +09:00
parent 7fe1b31a76 f090c9c8e4
commit 764f5bbdf9
2 changed files with 15 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,4 +2,4 @@ data
 config.php
 test*
 sirgle
-caption_sr_test.php
+sr_*
--- a/test.php
+++ b/test.php
@ -1,15 +1,22 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 <head>
-<meta charset="UTF-8">
+<meta charset="utf-8">
-<style>
+<title>AJAX 동적 컨텐츠 테스트</title>
-html {margin:0;padding:0;font-size:300%;font-family:"gulim"}
+<script src="js/jquery-1.8.3.min.js"></script>
 #x1 {width:100px;padding:1%;background:#ddd}
 </style>
 </head>
 <body>
-<div id="x1">깊은 산 속 옹달샘 누가 와서 먹나요</div>
+<a href="">클릭</a>
 <div></div>
 <script>
 $(function(){
    $('a').click(function(){
        $('div').text('클릭되었습니다.');
    });
 });
 </script>
 </body>
 </html>