vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 07:29:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed merge error (damn git)

Browse source
This commit is contained in:
Luca Deri 2016-06-15 16:52:01 +02:00
parent 71646ff4bb
commit bd1de5ad64
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/lua/modules/lua_utils.lua
View file

@ -2063,7 +2063,6 @@ end
-- ##########################################
<<<<<<< HEAD
function historicalProtoHostHref(ifId, host, l4_proto, ndpi_proto_id, info)
if ntop.isPro() and ntop.getPrefs().is_dump_flows_to_mysql_enabled == true then
local hist_url = ntop.getHttpPrefix().."/lua/pro/db_explorer.lua?search=true&ifId="..ifId
@ -2087,9 +2086,6 @@ end
-- ##########################################
_icmp_types = {
=======
_icmp_types ={
>>>>>>> c010813266e90d0e0601e58f22869624dd1d62f5
{ 0, 0, "Echo Reply" },
{ 3, 0, "Network Unreachable" },
{ 3, 1, "Host Unreachable" },