Getting rid of the Figure 1 : bit

In my Latex document I have a number of figures with Captions like the following :

\begin{wrapfigure}{l}{0.35\textwidth}
\begin{center}
\includegraphics[width=0.25\textwidth]{zhangsanfeng.jpg}

Changing git conflict markers

Is it possible to change the conflict markers to something user defined?

Motivation:

It has happened several times to me that, due to hasty and not very careful merging of several branches, there …

Track changes: svn + latex

In MS Word, there’s a nice feature called “track changes” that allows the program to track edits. This is useful when collaborating with others because you can enable various visualization modes …

QED symbol in latex

How do I type a QED symbol – I want a full box and not an empty box like \qed gives you. (I’m not using \begin{proof})