diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-02-22 15:36:33 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-02-22 15:36:33 +0000 |
| commit | 9f3615bb21946cfa17eaec83127fe9c42cb14a3d (patch) | |
| tree | c2cd9992514f883b4f2cfa5147dca3ef26c09bf8 /src | |
| parent | a6e60bef83d9b845ffba6de9fe71ca1afd277166 (diff) | |
| download | mana-9f3615bb21946cfa17eaec83127fe9c42cb14a3d.tar.gz mana-9f3615bb21946cfa17eaec83127fe9c42cb14a3d.tar.bz2 mana-9f3615bb21946cfa17eaec83127fe9c42cb14a3d.tar.xz mana-9f3615bb21946cfa17eaec83127fe9c42cb14a3d.zip | |
Please solve any merge conflicts before committing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/newskill.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp index e5d8c365..2cceaaca 100644 --- a/src/gui/newskill.cpp +++ b/src/gui/newskill.cpp @@ -17,13 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -<<<<<<< newskill.cpp - * - * $Id$ -======= * * $Id$ ->>>>>>> 1.4 */ /* This file implements the new skill dialog for use under the latest |