[kitagata_support-11737] ＨＰ更新依頼 確定申告

20201217

second/Tax.html

@@ -255,11 +255,8 @@
 								<span class="template_list">
 									<span class="template_list_img left"><img
 											src="../css/img/smallbutton_secondfloor.png" /></span>
-<<<<<<< HEAD
+
 									<a href="../third/living/Final-tax-return_R2.html">
-=======
-									<a href="../third/living/Final_tax_return_r2.html">
->>>>>>> origin/master
 										令和２年分の確定申告について</a></span><br />
 								<span class="clear"></span>
 							</div>