<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
I
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<span id="result_box" class="short_text" lang="en"><span class="hps">did.
But I wrote, IDE lock.<br>
I'm still testing, lazarus r49639 work normal. I mean, make
then lazbuild then in IDE my project builded. and debuging.<br>
</span></span><br>
<div class="moz-cite-prefix">On 15.08.2015 15:59, Mattias Gaertner
wrote:<br>
</div>
<blockquote cite="mid:20150815145950.018f5b70@limapholos.matflo.wg"
type="cite">
<pre wrap="">On Sat, 15 Aug 2015 15:51:47 +0300
FreeMan <a class="moz-txt-link-rfc2396E" href="mailto:freeman35@delphiturkiye.com"><freeman35@delphiturkiye.com></a> wrote:
</pre>
<blockquote type="cite">
<pre wrap="">[...]
Conflict discovered in
'/opt/lazarus/components/leakview/languages/heaptrcview.ru.po'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: df
</pre>
</blockquote>
<pre wrap="">
Choose tc
This can happen with .po files. Sometimes the committers forget to
commit files and commit them with one of the next revisions.
Mattias
</pre>
</blockquote>
<br>
</body>
</html>