Cleanup merge conflicting files

kabicin · kabicin · commit 63f73eb5b50f · 2023-07-10T11:30:38.000-04:00
diff --git a/ga/latest/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/latest/kernel/helpers/build/configuration_snippets/sessioncache-features.xml
@@ -2,8 +2,4 @@
   <featureManager>
     <feature>sessionCache-1.0</feature>
   </featureManager>
-<<<<<<< HEAD
 </server>
-=======
-</server>
->>>>>>> 34eeb1f (Update helpers to use features.sh)
