Diffstat (limited to 'noncore/games/tictac/main.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/games/tictac/main.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp index 0185b8c..cfff683 100644 --- a/noncore/games/tictac/main.cpp +++ b/noncore/games/tictac/main.cpp | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | /**************************************************************************** | 1 | /**************************************************************************** |
| 2 | <<<<<<< main.cpp | ||
| 3 | ** $Id$ | ||
| 4 | ======= | ||
| 5 | ** $Id$ | ||
| 6 | >>>>>>> 1.1.8.1.2.1 | ||
| 7 | ** | ||
| 8 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. |
| 9 | ** | 3 | ** |