Skip to content

Commit

Permalink
Resolved merge conflict and applied to azure branch
Browse files Browse the repository at this point in the history
  • Loading branch information
ByteYJ committed Aug 5, 2024
1 parent 2dc6045 commit 22bff17
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/msfocr/llm/ocr_functions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
"""Processing images by working with the Azure OpenAI API.
Note that the environment variable must be set for this module to work correctly.
<<<<<<< Updated upstream
"""
=======
Re"""
>>>>>>> Stashed changes
import base64
import json
from concurrent.futures.thread import ThreadPoolExecutor
Expand Down

0 comments on commit 22bff17

Please sign in to comment.