Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • bureau/admin/aide/help.php

    r102 r474  
    11<?php 
    22/* 
    3  $Id: help.php,v 1.2 2003/06/10 06:45:17 root Exp $ 
     3 $Id: help.php,v 1.3 2004/12/16 16:14:57 anonymous Exp $ 
    44 ---------------------------------------------------------------------- 
    55 AlternC - Web Hosting System 
    … …  
    5858</noframes> 
    5959</html> 
    60 >>>>>>> 1.12 
     60 
Note: See TracChangeset for help on using the changeset viewer.