Skip to content

Commit 22bff17

Browse files
committed
Resolved merge conflict and applied to azure branch
1 parent 2dc6045 commit 22bff17

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/msfocr/llm/ocr_functions.py

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
"""Processing images by working with the Azure OpenAI API.
22
Note that the environment variable must be set for this module to work correctly.
3+
<<<<<<< Updated upstream
34
"""
5+
=======
6+
Re"""
7+
>>>>>>> Stashed changes
48
import base64
59
import json
610
from concurrent.futures.thread import ThreadPoolExecutor

0 commit comments

Comments
 (0)