Fixed docs

Author: atkawa7

docs/generator.png

@@ -3,6 +3,7 @@
 
 An HTTP Request snippet generator for many languages & tools. It can generate code for over twelve different languages and currently supports cURL, Javascript, Node, C, Java, Objective-C, Swift, Python, Ruby, C#, Go, OCaml and more!.
 
+<<<<<<< HEAD
 ==== Usage
 Enable maven snapshots in `~/.m2/settings.xml`
 ```xml
@@ -89,6 +90,8 @@ cd httpsnippet
 mvn clean install
 java -jar httpsnippet-demo/target/httpsnippet-demo-0.0.1-SNAPSHOT.jar
 ```
+=======
+>>>>>>> a8855cf526135b93537ab2d47373d4b463b942f3
 
 ==== Har Request
 
@@ -195,7 +198,11 @@ then it will be merged into a new list and the resulting url in code snippets wi
 
 ==== Generators
 
+<<<<<<< HEAD
 Please start by browsing for available generators  and inspect each implementation. A generator is a simple class with a constructor that accepts two parameters: language and client where language is the target language i.e ```JAVA```, ```PYTHON```  and client is the target client that supports the language ```OKHTTP``` for ```JAVA```. The generator has ```generateCode``` function which converts ```HarRequest``` to ```HttpSnippet```.
+=======
+Please start by browsing for available generators  and inspect each implementation. A generator is a simple module with a constructor that accepts two parameters: language and client where language is the target language i.e ```JAVA```, ```PYTHON```  and client is the target client that supports the language ```OKHTTP``` for ```JAVA```. The generator has ```generateCode``` function which converts ```HarRequest``` to ```HttpSnippet```.
+>>>>>>> a8855cf526135b93537ab2d47373d4b463b942f3
 
 [plantuml, generators]
 ....

docs/index.adoc

@@ -215,6 +215,17 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>3.0.0</version>
+<<<<<<< HEAD
+=======
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>help</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+>>>>>>> a8855cf526135b93537ab2d47373d4b463b942f3
             </plugin>
         </plugins>
     </reporting>

httpsnippet/pom.xml

@@ -106,7 +106,11 @@
         <spotbugs-fb-contrib.version>7.4.3.sb</spotbugs-fb-contrib.version>
         <spotbugs-maven-plugin.version>3.1.11</spotbugs-maven-plugin.version>
         <spotless-maven-plugin.version>1.21.1</spotless-maven-plugin.version>
+<<<<<<< HEAD
         <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
+=======
+        <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
+>>>>>>> a8855cf526135b93537ab2d47373d4b463b942f3
         <springfox.version>2.9.2</springfox.version>
         <versions-maven-plugin.version>2.7</versions-maven-plugin.version>
         <xml-format-maven-plugin.version>3.0.7</xml-format-maven-plugin.version>