File tree Expand file tree Collapse file tree 1 file changed +1
-3
lines changed Expand file tree Collapse file tree 1 file changed +1
-3
lines changed Original file line number Diff line number Diff line change @@ -221,11 +221,10 @@ case $COMMAND in
221221 log_message=" ${LIGHT_BLUE}${BOLD} [TEST] USER DECRYPTION${RESET} "
222222 docker_args+=(" -g" " test user decrypt" )
223223 ;;
224- <<<<<<< HEAD
225224 paused-gateway-user-decryption)
226225 log_message=" ${LIGHT_BLUE}${BOLD} [TEST] PAUSED USER DECRYPTION${RESET} "
227226 docker_args+=(" -g" " test paused gateway user decrypt" )
228- =======
227+ ;;
229228 delegate-user-decryption)
230229 log_message=" ${LIGHT_BLUE}${BOLD} [TEST] USER DECRYPTION${RESET} "
231230 docker_args+=(" -g" " test delegation and revocation propagation" )
@@ -240,7 +239,6 @@ case $COMMAND in
240239 public-decryption)
241240 log_message=" ${LIGHT_BLUE}${BOLD} [TEST] PUBLIC DECRYPTION${RESET} "
242241 docker_args+=(" -g" " test async decrypt (uint.*|ebytes.* trivial|ebytes64 non-trivial|ebytes256 non-trivial with snapshot|addresses|several addresses)" )
243- >>>>>>> main
244242 ;;
245243 erc20)
246244 log_message=" ${LIGHT_BLUE}${BOLD} [TEST] ERC20${RESET} "
You can’t perform that action at this time.
0 commit comments