diff options
| author | Jenkins for Enea Linux Test Framework <eltf@list.enea.se> | 2020-09-16 22:51:45 +0200 |
|---|---|---|
| committer | mrpa <miruna.paun@enea.com> | 2020-10-12 19:23:42 +0200 |
| commit | 0c392e15649d9b29ee67de3d061c74efb8830c6f (patch) | |
| tree | 16db40e1e7dbda027b9e2d8533f9fe129bbeb969 | |
| parent | 83c9e02bf27c9b7642a13789b2c959351044b8a1 (diff) | |
| download | nfv-access-documentation-0c392e15649d9b29ee67de3d061c74efb8830c6f.tar.gz | |
Updated licenses.xml
| -rw-r--r-- | doc/book-enea-nfv-access-open-source/doc/licenses.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/book-enea-nfv-access-open-source/doc/licenses.xml b/doc/book-enea-nfv-access-open-source/doc/licenses.xml index 98da05d..7d5521c 100644 --- a/doc/book-enea-nfv-access-open-source/doc/licenses.xml +++ b/doc/book-enea-nfv-access-open-source/doc/licenses.xml | |||
| @@ -1175,7 +1175,11 @@ specific documentation.--> | |||
| 1175 | <entry>libgcc-initial</entry> | 1175 | <entry>libgcc-initial</entry> |
| 1176 | <entry>7.3.0</entry> | 1176 | <entry>7.3.0</entry> |
| 1177 | <entry>GNU cc and gcc C compilers.</entry> | 1177 | <entry>GNU cc and gcc C compilers.</entry> |
| 1178 | <<<<<<< HEAD | ||
| 1178 | <entry> GPL-3.0-with-GCC-exception, GPL-3.0</entry> | 1179 | <entry> GPL-3.0-with-GCC-exception, GPL-3.0</entry> |
| 1180 | ======= | ||
| 1181 | <entry>GPL-3.0-with-GCC-exception</entry> | ||
| 1182 | >>>>>>> Updated licenses.xml | ||
| 1179 | </row> | 1183 | </row> |
| 1180 | <row> | 1184 | <row> |
| 1181 | <entry>libgcc</entry> | 1185 | <entry>libgcc</entry> |