From 5ce0af8bd12d2c3186a58425e281a7bf7bafad58 Mon Sep 17 00:00:00 2001
From: cbrown <caleb.brown@udri.udayton.edu>
Date: Wed, 17 Apr 2024 12:00:54 -0400
Subject: [PATCH] Fixed Merge conflict

---
 Assets/Scripts/OnColliderTrigger.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Assets/Scripts/OnColliderTrigger.cs b/Assets/Scripts/OnColliderTrigger.cs
index 9216a6e4..9133da88 100644
--- a/Assets/Scripts/OnColliderTrigger.cs
+++ b/Assets/Scripts/OnColliderTrigger.cs
@@ -3,16 +3,10 @@ using UnityEngine.Events;
 
 namespace MAVRIC.GEEKCup
 {
-<<<<<<<< HEAD:Assets/Scripts/OnTrigger.cs
     [RequireComponent(typeof(Collider))]
-    public class OnTrigger : MonoBehaviour
-    {
-        [SerializeField] private bool invertResult = false;
-========
     public class OnColliderTrigger : MonoBehaviour
     {
         public bool invertResult = false;
->>>>>>>> development:Assets/Scripts/OnColliderTrigger.cs
         
         // TODO: Update this to use a UnityAtoms BoolReference
         [SerializeField] private UnityEvent<bool> onTrigger;