<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Benoît Minisini pushed to branch master
at <a href="https://gitlab.com/gambas/gambas">Gambas / gambas</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/gambas/gambas/commit/0064a9a25323c1b8a74c81dff0e0b7f79ce58231">0064a9a2</a></strong>
<div>
<span>by gambas</span>
<i>at 2019-05-18T15:43:40Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Fix '.project' and '.component' files that incorrectly had conflict marks in it.
[GB.NET.POP3]
* BUG: Fix '.project' and '.component' files that incorrectly had conflict marks in it.
</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class="file-stats">
<a href="https://gitlab.com/gambas/gambas/commit/0064a9a25323c1b8a74c81dff0e0b7f79ce58231#7305032932976b293632b6e99bbfe5f1f47e3ec0">
comp/src/gb.net.pop3/.component
</a>
</li>
<li class="file-stats">
<a href="https://gitlab.com/gambas/gambas/commit/0064a9a25323c1b8a74c81dff0e0b7f79ce58231#827540837e80479ab42959cf358c14384d342371">
comp/src/gb.net.pop3/.icon.png
</a>
</li>
<li class="file-stats">
<a href="https://gitlab.com/gambas/gambas/commit/0064a9a25323c1b8a74c81dff0e0b7f79ce58231#6a72037849d815bd579d07cd125d0644aac93fac">
comp/src/gb.net.pop3/.project
</a>
</li>
</ul>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://gitlab.com/gambas/gambas/commit/0064a9a25323c1b8a74c81dff0e0b7f79ce58231">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/gambas/gambas/commit/0064a9a25323c1b8a74c81dff0e0b7f79ce58231"}}</script>
</p>
</div>
</body>
</html>