From 445a66df6596e55e7054a68d8b2d140764c271d4 Mon Sep 17 00:00:00 2001
From: Adish <adish@hotmail.it>
Date: Sun, 22 Feb 2026 20:00:48 +0100
Subject: [PATCH] ingredient

---
 pages/ingredients_page.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pages/ingredients_page.py b/pages/ingredients_page.py
index fe22565..be18a27 100644
--- a/pages/ingredients_page.py
+++ b/pages/ingredients_page.py
@@ -2,12 +2,9 @@ import streamlit as st
 import requests
 import pandas as pd
 
-<<<<<<< HEAD
-=======
 from functions import cosing_download
 from functions_ui import download_pdf
 
->>>>>>> 584de757bb8f3d254116092e251676a2acfb5c8e
 API_BASE = "https://api.cosmoguard.it/api/v1"
 
 st.set_page_config(page_title="Ricerca Ingredienti", layout="wide")