update app.py

app.py

@@ -101,15 +101,12 @@ def main():
     manual_seed_range = st.sidebar.slider("Manual Seed Range", min_value=0, max_value=12013012031030, value=(0, 12013012031030))
     
     use_gpu = st.sidebar.radio("Select device:", ("CPU", "GPU"), index=0)
-<<<<<<< HEAD
     if use_gpu == "GPU":
         st.warning("You are currently using the GPU option. Please ensure your system has an Nvidia GPU with a minimum of 4 GB VRAM and has torch-gpu installed. If not, please use the CPU option. If you continue using the GPU option without meeting these requirements, it will result in an error.")
     
-=======
     if use_gpu=="GPU":
         st.warning("You are currently using the GPU option. Please ensure your system has an Nvidia GPU with a minimum of 4 GB VRAM and has torch-gpu installed. If not, please use the CPU option. If you continue using the GPU option without meeting these requirements, it will result in an error.")
 
->>>>>>> 489c9dafa01d3a5f5d9cd4e4e80297dd34d2f014
     disable_safety = st.sidebar.radio("Disable Safety Checker:", ("False", "True"), index=0)
 
     if disable_safety == "True":