From 2f34a35aedfe6e958fc6d8481fed33f40d1408f4 Mon Sep 17 00:00:00 2001
From: hultonha <hultonha@amazon.co.uk>
Date: Tue, 6 Jul 2021 17:46:24 +0100
Subject: [PATCH] removing .orig file from previous merge

Signed-off-by: hultonha <hultonha@amazon.co.uk>
---
 .../Gem/Code/enabled_gems.cmake.orig          | 68 -------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 AutomatedTesting/Gem/Code/enabled_gems.cmake.orig

diff --git a/AutomatedTesting/Gem/Code/enabled_gems.cmake.orig b/AutomatedTesting/Gem/Code/enabled_gems.cmake.orig
deleted file mode 100644
index 9e35410cc9..0000000000
--- a/AutomatedTesting/Gem/Code/enabled_gems.cmake.orig
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(ENABLED_GEMS
-    ImGui
-    ScriptEvents
-    ExpressionEvaluation
-    Gestures
-    CertificateManager
-    DebugDraw
-    SceneProcessing
-    GraphCanvas
-    InAppPurchases
-    AutomatedTesting
-    EditorPythonBindings
-    QtForPython
-    PythonAssetBuilder
-    Metastream
-    AudioSystem
-    Camera
-    EMotionFX
-    PhysX
-    CameraFramework
-    StartingPointMovement
-    StartingPointCamera
-    ScriptCanvas
-    ScriptCanvasPhysics
-    ScriptCanvasTesting
-    LyShineExamples
-    StartingPointInput
-    PhysXDebug
-    WhiteBox
-    FastNoise
-    SurfaceData
-    GradientSignal
-    Vegetation
-    GraphModel
-    LandscapeCanvas
-    NvCloth
-    Blast
-    Maestro
-    TextureAtlas
-    LmbrCentral
-    LyShine
-    HttpRequestor
-    Atom_AtomBridge
-<<<<<<< HEAD
-=======
-    AWSCore
-    AWSClientAuth
-    AWSMetrics
-    PythonCoverage
->>>>>>> upstream/development
-)
-
-# TODO remove conditional add once AWSNativeSDK libs are fixed for Android and Linux Monolithic release.
-set(aws_excluded_platforms Linux Android)
-if (NOT (LY_MONOLITHIC_GAME AND ${PAL_PLATFORM_NAME} IN_LIST aws_excluded_platforms))
-    list(APPEND ENABLED_GEMS
-        AWSCore
-        AWSClientAuth
-        AWSMetrics
-    )
-endif()