From 9fdbae0fe52b7875bdcba5b82d2f98fca8203d5e Mon Sep 17 00:00:00 2001
From: Mason <1281814306@qq.com>
Date: Tue, 30 Nov 2021 12:54:36 +0800
Subject: [PATCH] Initial commit

---
 README.md | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/README.md b/README.md
index b7381a7..1b2ef38 100644
--- a/README.md
+++ b/README.md
@@ -31,27 +31,16 @@ ANY PROBLEMS ARISING FROM THIS WILL BE BORNE BY THE USER (YOU).
 > python typroa.py --help
 usage: typora.py [-h] [-u] [-f] asarPath dirPath
 
-<<<<<<< HEAD
-extract and decryption app.asar file from [Typora].
-
-positional arguments:
-  asarPath    app.asar file path [input/ouput]
-=======
 [extract and decryption / pack and encryption] app.asar file from [Typora].
 
 positional arguments:
   asarPath    app.asar file path/dir [input/ouput]
->>>>>>> Initial commit
   dirPath     as tmp and out directory.
 
 optional arguments:
   -h, --help  show this help message and exit
   -u          pack & encryption (default: extract & decryption)
-<<<<<<< HEAD
-  -f          enabled prettify/compress (default: disabled
-=======
   -f          enabled prettify/compress (default: disabled)
->>>>>>> Initial commit
 
 If you have any questions, please contact [ MasonShi@88.com ]