resolving conficts after merging

This commit is contained in:
apostolos
2021-11-13 18:58:22 +02:00
31 changed files with 1283 additions and 322 deletions

View File

@@ -632,9 +632,9 @@ set (hs_exec_SRCS
src/nfa/tamarama_internal.h
src/nfa/truffle.cpp
src/nfa/truffle.h
src/nfa/vermicelli.h
src/nfa/vermicelli.hpp
src/nfa/vermicelli_run.h
src/nfa/vermicelli_sse.h
src/nfa/vermicelli_simd.cpp
src/som/som.h
src/som/som_operation.h
src/som/som_runtime.h