Skip to content

A curated collection of practical AI projects implementing OCR systems, RAG, AI agents, and other AI use cases.

fix(cal_scheduling_agent): remove unresolved merge conflict markers

Rudy Celeklia75b79eff861
diff --git a/ai_agents/cal_scheduling_agent/.env.example b/ai_agents/cal_scheduling_agent/.env.example
index 0ea5a2a..9e2c6dc 100644
--- a/ai_agents/cal_scheduling_agent/.env.example
+++ b/ai_agents/cal_scheduling_agent/.env.example
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-GOOGLE_API_KEY=your_google_api_key_here
-CALCOM_API_KEY=your_calcom_api_key_here
-CALCOM_EVENT_TYPE_ID= # optional — scopes availability to a specific event type
-=======
# Google API key used to authenticate Gemini 3 Flash requests. Get one free at https://aistudio.google.com
GOOGLE_API_KEY=your_google_api_key_here
@@ -11,4 +6,3 @@ CALCOM_API_KEY=your_calcom_api_key_here
# Optional. Scopes availability checks to a specific event type. Find the ID in the URL when editing an event type on your Cal.com dashboard.
CALCOM_EVENT_TYPE_ID=
->>>>>>> 1d1e9f137cfd1123edbae5d8e955ce0b9c7fcf4a
diff --git a/ai_agents/cal_scheduling_agent/app.py b/ai_agents/cal_scheduling_agent/app.py
index 055438a..8d9c26e 100644
--- a/ai_agents/cal_scheduling_agent/app.py
+++ b/ai_agents/cal_scheduling_agent/app.py
@@ -1,9 +1,5 @@
"""
-<<<<<<< HEAD
-Cal Scheduling Agent — Streamlit UI
-=======
Cal Scheduling Agent: Streamlit UI for managing Cal.com appointments through natural language.
->>>>>>> 1d1e9f137cfd1123edbae5d8e955ce0b9c7fcf4a
"""
import os
@@ -34,10 +30,7 @@ EXAMPLE_QUERIES = [
def build_instructions(timezone: str = "UTC") -> str:
-<<<<<<< HEAD
-=======
"""Return the system instruction string for the agent, injecting today's date and the user's timezone."""
->>>>>>> 1d1e9f137cfd1123edbae5d8e955ce0b9c7fcf4a
today = datetime.now().strftime("%A, %B %d, %Y")
return f"""\
You are a friendly and efficient calendar scheduling assistant with access to \
diff --git a/ai_agents/cal_scheduling_agent/cal_scheduling_agent/agent.py b/ai_agents/cal_scheduling_agent/cal_scheduling_agent/agent.py
index 1c35025..ae08e11 100644
--- a/ai_agents/cal_scheduling_agent/cal_scheduling_agent/agent.py
+++ b/ai_agents/cal_scheduling_agent/cal_scheduling_agent/agent.py
@@ -1,9 +1,5 @@
"""
-<<<<<<< HEAD
-Cal Scheduling Agent — Agno agent definition.
-=======
Cal Scheduling Agent: Agno agent definition for managing Cal.com appointments.
->>>>>>> 1d1e9f137cfd1123edbae5d8e955ce0b9c7fcf4a
"""
import os