fixup! test: add test for RenderNgAppService

storybookjs · Dec 1, 2020 · 5e6e3d9 · 5e6e3d9
1 parent bf5e61d
commit 5e6e3d9
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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
   ]
 }