16 lines
275 B
INI
16 lines
275 B
INI
[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
|