<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
GIT STATUS:
<blockquote type="cite"
cite="mid:59292020.355445.1716449962103.JavaMail.zextras@connectlife.it">
<div
style="font-family: arial, helvetica, sans-serif; font-size: 10pt; color: #000000">
<p>Unmerged paths:<br>
(use "git restore --staged <file>..." to unstage)<br>
(use "git add <file>..." to mark resolution)<br>
both modified:
templates/etc/default/victoria-metrics.tt2<br>
both modified:
templates/etc/exim4/update-exim4.conf.conf.tt2<br>
both modified:
templates/etc/kamailio/proxy/kamailio.cfg.tt2<br>
both modified:
templates/etc/kamailio/proxy/local_applications.cfg.tt2<br>
both modified:
templates/etc/kamailio/proxy/proxy.cfg.tt2 <br>
</p>
</div>
</blockquote>
Ok, I can't reproduce it locally so assume there are some local
changes.<br>
Pls run 'git diff templates/etc/default/victoria-metrics.tt2' in
/etc/ngcp-config<br>
<pre class="moz-signature" cols="72">--
WBR
---
Mykola Malkov</pre>
</body>
</html>