conflicts

tiago80673 · Oct 20, 2021 · a3c0d6c · a3c0d6c
1 parent a967745
commit a3c0d6c
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,14 +60,12 @@ packages/server/support
 packages/server/test/support/fixtures/server/imgs
 packages/server/test/support/fixtures/server/libs
 
-<<<<<<< HEAD
 # from socket, dist built files
 packages/socket/lib/*.js
-=======
+
 # from system-tests
 system-tests/.projects
 system-tests/fixtures/large-img
->>>>>>> develop
 
 # from npm/react
 /npm/react/bin/*