fixed merge conflicts

maven-embedder/src/site/apt/logging.apt

@@ -24,11 +24,7 @@ Maven Logging
 
  Plexus Logger and LoggerManager can be injected in Plexus component using Plexus annotations
 
-<<<<<<< HEAD
-+------
-=======
 +------+
->>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
@@ -43,26 +39,11 @@ public class DefaultMyComponent
     @Requirement
     private LoggerManager loggerManager;
 }
-<<<<<<< HEAD
-+------
-=======
 +------+
->>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
 
  Starting with Maven 3.1.0, SLF4J Logger can be used directly too, without Plexus. Of course, this will only work when run under
  Maven 3.1.0, then this technique can be used safely only in Maven core components.
  
-<<<<<<< HEAD
-+-----
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Wombat
-{
-   final Logger logger = LoggerFactory.getLogger(Wombat.class);
-}
-+-----
-=======
 +-----+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,7 +53,6 @@ public class MyClass
    final Logger logger = LoggerFactory.getLogger( MyClass.class );
 }
 +-----+
->>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
 
 * Logger Name
 

maven-plugin-api/src/site/apt/index.apt

@@ -3,35 +3,20 @@
  -----
  Hervé Boutemy
  -----
-<<<<<<< HEAD
  2012-06-02
-=======
- 2011-10-16
->>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be
  -----
 
 Maven Plugin API
 
-<<<<<<< HEAD
  The API for plugins - composed of goals implemented by Mojos - development.
 
  A plugin is described in a {{{./plugin.html}<<<META-INF/maven/plugin.xml>>> plugin descriptor}},
  generally generated from plugin sources using {{{/plugin-tools/maven-plugin-plugin/}maven-plugin-plugin}}.
-=======
- The API for plugins - Mojos - development.
-
- A plugin is described in a {{{./plugin.html}<<<META-INF/maven/plugin.xml>>> plugin descriptor}},
- generally generated from plugin sources using {{{/plugins/maven-plugin-plugin/}maven-plugin-plugin}}.
->>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be
 
 * See Also
 
  * {{{/developers/mojo-api-specification.html}Mojo API Specification}}
 
-<<<<<<< HEAD
  * {{{/plugin-tools/}plugin-tools}}
 
  * {{{/plugin-testing/}plugin-testing}}
-=======
- * {{{/plugin-tools/}plugin-tools}}, containing {{{/plugins/maven-plugin-plugin/}maven-plugin-plugin}}
->>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be