Skip to content

GitLab

"llm/vscode:/vscode.git/clone" did not exist on "63efa075a0e82688e4fb49fa0bcc081db5f2a5b7"
Commit 1927699a authored by bzantium's avatar bzantium
Browse files

fix conflict for upstream

parent 63001b68
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
.gitignore
View file @ 1927699a
...@@ -3,3 +3,7 @@ env ...@@ -3,3 +3,7 @@ env
data/ data/
lm_cache lm_cache
.idea .idea
build/
logs/
output/
lm_eval.egg-info/
\ No newline at end of file
lm_eval/tasks/__init__.py
View file @ 1927699a
...@@ -50,7 +50,6 @@ from . import blimp ...@@ -50,7 +50,6 @@ from . import blimp
from . import asdiv from . import asdiv
from . import gsm8k from . import gsm8k
from . import storycloze from . import storycloze
<<<<<<< HEAD
from . import kobest from . import kobest
from . import nsmc from . import nsmc
from . import klue from . import klue
...@@ -58,7 +57,6 @@ from . import ko_translation ...@@ -58,7 +57,6 @@ from . import ko_translation
from . import korquad from . import korquad
from . import korunsmile from . import korunsmile
from . import kohatespeech from . import kohatespeech
=======
from . import toxigen from . import toxigen
from . import crowspairs from . import crowspairs
from . import json from . import json
...@@ -69,7 +67,6 @@ from . import xwinograd ...@@ -69,7 +67,6 @@ from . import xwinograd
from . import pawsx from . import pawsx
from . import xnli from . import xnli
from . import mgsm from . import mgsm
>>>>>>> 84ef60eeb3c04bcabd11adfaed26a88a33a5ad9c
######################################## ########################################
# Translation tasks # Translation tasks
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment