sij/sw1tch
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflict in canary.py

Browse source
This commit is contained in:
Sangye Ince-Johannsen 2025-04-06 21:18:11 +00:00
parent 408d9dea4d
commit 57b0eefe3b
1 changed files with 0 additions and 8 deletions

8
sw1tch/canary.py
View file

@ -12,19 +12,11 @@ from pathlib import Path
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry
<<<<<<< HEAD
# File paths relative to the sw1tch/ directory
BASE_DIR = Path(__file__).parent
CONFIG_FILE = BASE_DIR / "config" / "config.yaml"
ATTESTATIONS_FILE = BASE_DIR / "config" / "attestations.txt"
OUTPUT_FILE = BASE_DIR / "data" / "canary.txt"
TEMP_MESSAGE_FILE = BASE_DIR / "data" / "temp_canary_message.txt"
=======
# File paths
CONFIG_FILE = "config/config.yaml"
OUTPUT_FILE = "data/canary.txt"
TEMP_MESSAGE_FILE = "temp_canary_message.txt"
>>>>>>> f419c8f88cefbb352adc3c15f846d05ec588c595
def load_config():
"""Load configuration from YAML file."""