v 1.2

tfkq · Jul 15, 2021 · ed426d2 · ed426d2
1 parent ee4866c
commit ed426d2
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -50,14 +50,10 @@ Installation
 	* Run following command to download from github.
 
 ```sh
-curl -sL https://github.com/gavinlyonsrepo/SSD1306_OLED_RPI/archive/1.1.tar.gz | tar xz
+curl -sL https://github.com/gavinlyonsrepo/SSD1306_OLED_RPI/archive/1.2.tar.gz | tar xz
 ```
 
-<<<<<<< HEAD
-4. Run "make" to run the makefile in base folder to install library, it will be 
-=======
-4. Run "make" to run the makefile in repo root folder to install library, it will be 
->>>>>>> 39577d4a569e72ab5f2573ce412cb55b125905b1
+4. Run "make" to run the makefile in repo base folder to install library, it will be 
     installed to usr/lib and usr/include
 
 ```sh