diff options
| author | herbelin | 2003-04-07 17:42:50 +0000 |
|---|---|---|
| committer | herbelin | 2003-04-07 17:42:50 +0000 |
| commit | ee7a12cadf868f9bd01b6836fb9010450bf352ae (patch) | |
| tree | 3a87f23ad10ea41ffeeceee3baec99c6b4cef7c7 /dev/base_include | |
| parent | 4ab520180b7597f8358f9d351151cd73e43858a3 (diff) | |
Mauvaise resolution conflit dans commit precedent
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3859 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'dev/base_include')
0 files changed, 0 insertions, 0 deletions