merge histories

.gitattributes

@@ -31,4 +31,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text
+*tfevents* filter=lfs diff=lfs merge=lfs -text

.github/workflows/spaces.yml

@@ -16,4 +16,4 @@ jobs:
       - name: Push to hub
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
-        run: git push https://edadaltocg:$HF_TOKEN@huggingface.co/spaces/edadaltocg/ood-detection main 
+        run: git push https://edadaltocg:$HF_TOKEN@huggingface.co/spaces/edadaltocg/ood-detection main 

README.md

@@ -10,6 +10,7 @@ pinned: true
 license: mit
 ---
 
+<<<<<<< HEAD
 # OOD Detection Demo
 
 Out-of-distribution (OOD) detection is an essential safety measure for machine learning models. This app demonstrates how these methods can be useful in determining wether the inputs of a ResNet-50 model trained on ImageNet-1K can be trusted by the model.
@@ -36,4 +37,7 @@ python app.py
 
 - [ ] [Mahalanobis Distance](https://arxiv.org/abs/1807.03888)
 - [x] [Maximum Softmax Probability](https://arxiv.org/abs/1610.02136)
-- [x] [Energy Based Out-of-Distribution Detection](https://arxiv.org/abs/2010.03759)
+- [x] [Energy Based Out-of-Distribution Detection](https://arxiv.org/abs/2010.03759)
+=======
+# OOD Detection
+>>>>>>> 45fabfa417588e2aeb366695552bd6c8de1e73cc