X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FMerge%2Fsrc%2Forg%2Ftianocore%2FMerge%2FMerge.java;fp=Tools%2FSource%2FMerge%2Fsrc%2Forg%2Ftianocore%2FMerge%2FMerge.java;h=0000000000000000000000000000000000000000;hp=6f727861dc6d92952a9b496ec1b4f45a8f41db24;hb=feccee87a78e68d575dbdf44b34ca0cb5a21ea8d;hpb=214b0d1914b48d651b25e58f321ddb77a46903b8 diff --git a/Tools/Source/Merge/src/org/tianocore/Merge/Merge.java b/Tools/Source/Merge/src/org/tianocore/Merge/Merge.java deleted file mode 100644 index 6f727861dc..0000000000 --- a/Tools/Source/Merge/src/org/tianocore/Merge/Merge.java +++ /dev/null @@ -1,24 +0,0 @@ -// @file -// Merge wrapper -// -// Copyright (c) 2006, Intel Corporation All rights reserved. -// -// This program and the accompanying materials are licensed and made -// available under the terms and conditions of the BSD License which -// accompanies this distribution. The full text of the license may -// be found at http://opensource.org/licenses/bsd-license.php -// -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -// - -package org.tianocore.Merge; - -public class Merge { - - public static void main(String[] args) { - if (new MergeCmd().MergeCmdLine(args) != 0) - System.exit(1); - System.exit(0); - } -}