From 5e6e3d9dd4058208d184122ab1d2c21a050e88d4 Mon Sep 17 00:00:00 2001
From: ThibaudAv <thibaud.avenier@gmail.com>
Date: Tue, 1 Dec 2020 12:26:38 +0100
Subject: [PATCH] fixup! test: add test for RenderNgAppService

---
 tsconfig.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index f8423ead9a27..da833f0dcec0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,10 +23,7 @@
     "**/*.spec.ts",
     "**/__tests__",
     "**/*.test.ts",
-<<<<<<< HEAD
-    "**/FlowType*"
-=======
+    "**/FlowType*",
     "**/setup-jest.ts"
->>>>>>> test: add test for RenderNgAppService
   ]
 }