WASdev
diff --git a/‎ga/22.0.0.12/kernel/helpers/runtime/configure-liberty.sh‎
Lines changed: 0 additions & 54 deletions b/‎ga/22.0.0.12/kernel/helpers/runtime/configure-liberty.sh‎
Lines changed: 0 additions & 54 deletions
diff --git a/‎ga/latest/kernel/helpers/build/configuration_snippets/sessioncache-features.xml‎
Lines changed: 0 additions & 4 deletions b/‎ga/latest/kernel/helpers/build/configuration_snippets/sessioncache-features.xml‎
Lines changed: 0 additions & 4 deletions
@@ -2,8 +2,4 @@
   <featureManager>
     <feature>sessionCache-1.0</feature>
   </featureManager>
-<<<<<<< HEAD
 </server>
-=======
-</server>
->>>>>>> 34eeb1f (Update helpers to use features.sh)