conversion successfully completed

khushipatil1523 · Jan 3, 2025 · ff3bf5b · ff3bf5b
1 parent b90fa0b
commit ff3bf5b
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.env_BACKUP_322.example b/.env_BACKUP_322.example
@@ -24,16 +24,8 @@ REACT_APP_USE_RECAPTCHA=
 REACT_APP_RECAPTCHA_SITE_KEY=
 
 # has to be inserted in the env file to use plugins and other websocket based features.
-<<<<<<< HEAD
-REACT_APP_BACKEND_WEBSOCKET_URL=ws://localhost:4000/graphql/
-
-# If you want to logs Compiletime and Runtime error , warning and info write YES or if u want to  
-# keep the console clean leave it blank
-ALLOW_LOGS=
-=======
 REACT_APP_BACKEND_WEBSOCKET_URL=ws://localhost:4000/graphql
 
 # If you want to logs Compiletime and Runtime error , warning and info write YES or if u want to  
 # keep the console clean leave it blank
 ALLOW_LOGS=
->>>>>>> e828b78dc0e735340e25e402ecf859e8fb8fda4f