commit f4745fee459d6b990b324203d0b1e5bc897f4cf7
Author: shiwa <shiwa@i-hearts.jp>
Date:   Fri Mar 11 19:36:15 2016 +0900

    login_top、及び管理画面の修正

diff --git a/app/View/Programs/index.ctp b/app/View/Programs/index.ctp
index 02d0c72..c1c365d 100755
--- a/app/View/Programs/index.ctp
+++ b/app/View/Programs/index.ctp
@@ -22,7 +22,6 @@
 					</ul>
 				</section>
 			<?php endforeach; ?>
-<<<<<<< HEAD
 
 			<!-- Blank Area -->
 
@@ -51,19 +50,6 @@
 						</section>
 					</section>
 				';
-=======
-			<?php var_dump($countprograms); ?>
-			<?php 
-				if($countprograms < 9){
-					for($i=0 ; $i<(10-$countprograms) ; $i++){
-					echo '<section class="blank_data">
-							<a name="#save_data10">
-								<img src="/img/img_save_sample02.png" alt="タイトル">
-							</a>
-							<span class="blank"><a href="">あたらしく作る</a></span>
-						</section>';
-					}
->>>>>>> 22fd3a57332c6aa77b895d52fe3fbc4a06169e05
 				}
 			}
 			?>
diff --git a/app/View/top/login_top.ctp b/app/View/top/login_top.ctp
index 44fb252..03f461b 100755
--- a/app/View/top/login_top.ctp
+++ b/app/View/top/login_top.ctp
@@ -15,6 +15,9 @@
 			<section class="howto">
 				<p class="howto_btn"><a href="/top/howto"><img src="/img/img_arrow_top04.png">PictCodeの使い方</a></p>
 			</section>
+			<section>
+			<p class="withdraw">退会は<a href="#">コチラ</a></p>
+			</section>
 		</article>
 	</main>
 
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 1b27484..bc7e684 100755
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -860,6 +860,21 @@ section.howto p.howto_btn:hover{
 	box-shadow:none;
 }
 
+section p.withdraw {
+	display: block;
+	float: right;
+	margin:-60px 0 0;
+	font-weight: bold;
+	font-size: 14px !important;
+}
+
+section p.withdraw a {
+	color: red !important;
+	font-size: 14px;
+}
+
+
+
 /* Program Delete */
 
 section.delete img {