Update README.md

sokolmarek · May 13, 2022 · e6055ae · e6055ae
1 parent ba69c57
commit e6055ae
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,3 @@
-<<<<<<< Updated upstream
-# QOscope
-
-# Introduction
-
-# Requirements
-
-# Installation and usage
-=======
 
 # qoscope
 
@@ -70,4 +61,3 @@ If anyone wonders about the equation I used for baud prescale (to avoid rounding
  or wants useful literature for AVR and USART, for example [AVR articles](http://www.fourwalledcubicle.com/AVRArticles.php) 
  are a pretty good source within a few topics.
 
->>>>>>> Stashed changes