・コンフリクトの修正に失敗していたのでもう一度。

diff --git a/Giko.dfm b/Giko.dfm
index 15c1331..85e7652 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -7933,16 +7933,6 @@ object GikoForm: TGikoForm
       Hint = #12484#12540#12523#12496#12540#35373#23450#12480#12452#12450#12525#12464#12434#38283#12367
       OnExecute = ToolBarSettingActionExecute
     end
-    object AllResAction: TAction
-      Category = #12473#12524#12483#12489
-      AutoCheck = True
-      Caption = #12377#12409#12390#34920#31034'(&A)'
-      GroupIndex = 2
-      Hint = #12473#12524#12483#12489#12434#12377#12409#12390#34920#31034#12377#12427
-      ImageIndex = 9
-      OnExecute = AllResActionExecute
-      OnUpdate = AllResActionUpdate
-    end
     object SelectResAction: TAction
       Category = #12473#12524#12483#12489
       AutoCheck = True