Update README.md

place-bo · Jan 21, 2025 · 5d58c7f · 5d58c7f
1 parent a5453cf
commit 5d58c7f
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 # SciConstant_Matlab
-<<<<<<< HEAD
 
 This is a collection of Scientifc Constant for Matlab useage.
 
@@ -15,14 +14,11 @@ SciConstant('c').value
 SciConstant('c').unit
 SciConstant('c').name
 ```
-## The struct of the container
+## The structure of the container
 
 |name|value|unit|full name|
 |-|-|-|-|
 |$q$|$1.602176634\times10^{-19}$|C|Elementary Charge|
 |$k_B$|$1.380649\times10^{-23}$|J/K|Boltzmann Constant|
 ...
 
-=======
-This is a collection of Scientific Constant for Matlab use.
->>>>>>> 30f8c1868855073d26e1bc4ffb4101fe89c6a375