dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 0cff48: Fix: merge conflict

From: Regis Houssin
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 0cff48: Fix: merge conflict
Date: Tue, 21 Feb 2012 01:47:20 -0800 
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0cff48f9b30432005eaad93e55c03b8f16169085
      
https://github.com/Dolibarr/dolibarr/commit/0cff48f9b30432005eaad93e55c03b8f16169085
  Author: Regis Houssin <address@hidden>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
  M htdocs/core/class/conf.class.php
  M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix: merge conflict
reply via email to
[Prev in Thread] Current Thread [Next in Thread]