Removed git conflicts headers from config-fiqa.yaml and config-nq.yaml. Also added .idea in .gitignore file (NVIDIA#225)

* removed git conflicts markers.

* removed git conflict markers from config-fiqa.yaml and config-nq.yaml

* ignore .idea

---------

Co-authored-by: Gaurav Kantrod <[email protected]>

Author: gauravkantrodtw

.gitignore

@@ -28,4 +28,7 @@ RAG/examples/simple-rag-api-catalog.yaml
 # Notebook checkpoints
 RAG/notebooks/langchain/.ipynb_checkpoints
 RAG/notebooks/langchain/data/nv_embedding
-RAG/notebooks/langchain/data/save_embedding
+RAG/notebooks/langchain/data/save_embedding
+
+# IntelliJ's project specific settings file
+.idea

nemo/retriever-synthetic-data-generation/scripts/conf/config-fiqa.yaml

@@ -18,7 +18,7 @@ qa_generator:
   # mistralai/mixtral-8x22b-instruct-v0.1
   base_url: https://integrate.api.nvidia.com/v1
   max_examples: ${max_examples}
-  generate_config:ß
+  generate_config:
     temperature: 0.5
     top_p: 1.0
     max_tokens: 2048
@@ -120,13 +120,8 @@ answerability_filter:
 filters:
   -
     ${answerability_filter}
-<<<<<<< HEAD
-  - 
+  -
     ${easiness_filter}
-=======
-  # - 
-  #   ${easiness_filter}
->>>>>>> 3d49ef8 (added config-nq and config-fiqa)
 
 
 post_processors:
@@ -138,3 +133,4 @@ analyzers:
     _target_: nemo_retriever_sdg.QuestionLengthAnalyzer
   -
     _target_: nemo_retriever_sdg.LexicalDivergenceAnalyzer
+

nemo/retriever-synthetic-data-generation/scripts/conf/config-nq.yaml

@@ -124,14 +124,9 @@ answerability_filter:
 filters:
   -
     ${answerability_filter}
-<<<<<<< HEAD
-  - 
+  -
     ${easiness_filter}
-=======
-  # - 
-  #   ${easiness_filter}
->>>>>>> 3d49ef8 (added config-nq and config-fiqa)
-  
+
 
 post_processors:
   - 
@@ -142,3 +137,4 @@ analyzers:
     _target_: nemo_retriever_sdg.QuestionLengthAnalyzer
   -
     _target_: nemo_retriever_sdg.LexicalDivergenceAnalyzer
+