Mercurial > hg > truffle
diff LICENSE.LGPL @ 20806:6ee9b878902b
Fix merge mess-ups
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 07 Apr 2015 18:57:02 +0200 |
parents | 0fbee3eb71f0 |
children |
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 07 Apr 2015 18:57:02 +0200 |
parents | 0fbee3eb71f0 |
children |