remove merge conflict remnant

Author: DaltheCow

.gitignore

@@ -179,10 +179,7 @@ cython_debug/
 *.json
 *.yaml
 
-<<<<<<< HEAD
-=======
 
->>>>>>> testing-tooling
 # UI Section - Next.js/React application under src/ui/
 # dependencies
 /node_modules/
@@ -225,4 +222,4 @@ src/ui/next-env.d.ts
 !package-lock.json
 !.eslintrc.json
 !tsconfig.*.json
-!src/ui/lib
+!src/ui/lib