File Attached...<br><br><br><div class="gmail_quote">On Thu, Jun 25, 2009 at 12:16 AM, Chris Want <span dir="ltr">&lt;<a href="mailto:cwant@ualberta.ca">cwant@ualberta.ca</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div><div></div><div class="h5">Joshua Leung wrote:<br>
&gt; Argh!<br>
&gt;<br>
&gt; It seems that I once again have heaps of weird conflicts again (probably<br>
&gt; as a result of having some commits occurring in 2.5 before my previous<br>
&gt; merge was completed). Anyways, I&#39;m currently unable to continue merging<br>
&gt; as TortoiseSVN bails out on rna_object_force.c with complaints of<br>
&gt; &quot;inconsistent line endings&quot;.<br>
&gt;<br>
&gt; Help on this would be great.<br>
&gt; My last merge commit was<br>
&gt; <a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&amp;root=bf-blender&amp;revision=21074" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&amp;root=bf-blender&amp;revision=21074</a><br>

&gt; &lt;<a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&amp;root=bf-blender&amp;revision=21074" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&amp;root=bf-blender&amp;revision=21074</a>&gt;<br>

&gt;<br>
&gt; Cheers,<br>
&gt; Joshua<br>
<br>
</div></div>Can you send the file from your working copy to the list?<br>
<font color="#888888"><br>
Chris<br>
</font><div><div></div><div class="h5"><br>
_______________________________________________<br>
Soc-2009-dev mailing list<br>
<a href="mailto:Soc-2009-dev@blender.org">Soc-2009-dev@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/soc-2009-dev" target="_blank">http://lists.blender.org/mailman/listinfo/soc-2009-dev</a><br>
</div></div></blockquote></div><br>