Changeset 474

Timestamp:

02/22/06 00:22:13 (7 years ago)

Author:

anarcat

Message:

[project @ alternc: changeset 2004-12-16 16:14:57 by anonymous]
enlever un restant de conflit

Original author: anonymous
Date: 2004-12-16 16:14:57

File:

• bureau/admin/aide/help.php (modified) (2 diffs)

bureau/admin/aide/help.php

@@ -1 +1 @@
 <?php
 /*
- $Id: help.php,v 1.2 2003/06/10 06:45:17 root Exp $
+ $Id: help.php,v 1.3 2004/12/16 16:14:57 anonymous Exp $
  ----------------------------------------------------------------------
  AlternC - Web Hosting System
@@ -58 +58 @@
 </noframes>
 </html>
->>>>>>> 1.12
+