codingbychanche
diff --git a/‎README.md‎
Lines changed: 1 addition & 24 deletions b/‎README.md‎
Lines changed: 1 addition & 24 deletions
@@ -1,7 +1,6 @@
 # Resistors
 A collection of algorithms helping to calculate the properties of resistors. E.g. find the closest value of a standard resistor within a given error margin for a resistance needed. The tool will tell you the standard value and the first standard series in which it was found.
 
-<<<<<<< HEAD
 <!DOCTYPE html>
 <head>
 <style>
@@ -18,28 +17,6 @@ text-align: center;
 =======
 [Voltage Divider App. An app I wrote to demonstrate what this library can do.](https://play.google.com/store/apps/details?id=com.berthold.voltagedivider)
 
-![](SampleOutput.png)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> e6802e82eb621e7e8582029a8a7ac4db5165c272
 
 </head>
 <body>
@@ -1395,4 +1372,4 @@ text-align: center;
 <td>0.4247024607974246</td>
 </tr>
 </table>
-</body>
+</body>