Rehabilitate tests after merge

2021-08-17 09:44:52 +02:00
parent d00af34528
commit e80e5fb8dc
4 changed files with 8 additions and 14 deletions
--- a/apps/cic-eth/cic_eth/data/config/redis.ini
+++ b/apps/cic-eth/cic_eth/data/config/redis.ini
@@ -1,15 +1,5 @@
 [redis]
 host = localhost
-<<<<<<< HEAD
 port = 6379
 db = 0
 timeout = 20.0
-=======
-<<<<<<<< HEAD:apps/cic-eth/config/docker/redis.ini
-port = 63379
-========
-port = 6379
-db = 0
-timeout = 20.0
->>>>>>>> origin/master:apps/cic-eth/cic_eth/data/config/redis.ini
->>>>>>> origin/master