1 files changed, 10 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 7cf22a9..5e56784 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,17 @@ specific documentation.-->
  <entry>libgcc-initial</entry>
  <entry>7.3.0</entry>
  <entry>GNU cc and gcc C compilers.</entry>
+<<<<<<< HEAD
+ <entry> GPL-3.0-with-GCC-exception, GPL-3.0</entry>
+=======
  <entry>GPL-3.0-with-GCC-exception</entry>
+>>>>>>> Updated licenses.xml
+</row>
+<row>
+ <entry>libgcc</entry>
+ <entry>7.3.0</entry>
+ <entry>GNU cc and gcc C compilers.</entry>
+ <entry> GPL-3.0-with-GCC-exception, GPL-3.0</entry>
 </row>
 <row>
  <entry>libgcc</entry>