8000 Resolve merge-conflicts in README.md · ikostoski/esp32_https_server@ac331ac · GitHub
[go: up one dir, main page]
Skip to content

Commit ac331ac

Browse files
fhesselfhessel
committed
Resolve merge-conflicts in README.md
2 parents b18fc37 + 272f1b6 commit ac331ac

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The library is self-contained and just needs the Arduino and ESP32 system librar
1818

1919
## Setup Instructions
2020

21-
Clone or download the content of this git repository into your Arduino/libraries folder and restart you IDE.
21+
Clone or download the content of this git repository into your Arduino/libraries folder and restart your IDE.
2222

2323
To run the examples (except for the _Self-Signed-Certificates_ example), you need to execute the script extras/create_cert.sh first. This script will create a simple CA to sign certificates that are used with the examples. Some notes on the usage can be found in the extras/README.md file.
2424

@@ -176,4 +176,4 @@ build_flags =
176176
-DHTTPS_DISABLE_SELFSIGNING
177177
```
178178

179-
Note the `-D` in front of the actual flag name, that passes this flag as a definition to the preprocessor. Multiple flags can be added one per line.
179+
Note the `-D` in front of the actual flag name, that passes this flag as a definition to the preprocessor. Multiple flags can be added one per line.

0 commit comments

Comments
 (0)
0