changed README

JannikSchneider12 · Nov 29, 2024 · 34320bf · 34320bf
1 parent 3f71906
commit 34320bf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,4 @@ __pycache__
 <<<<<<< HEAD
 myenv/
 =======
->>>>>>> 5c5278225349e418bd42735e70aa3f193fec6709
+
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Additional ReadMe (from Jannik)
 This was a toy example to test the setup. The main building blocks are:
 * The annotation files (in the annotations folder) that contain a label for every datapoint (in this case an image path) where they are divided by train and val splits and each challenge phase has its own file
@@ -14,8 +13,6 @@ This was a toy example to test the setup. The main building blocks are:
 
 # Original EvalAI ReadMe
 
-=======
->>>>>>> 5c5278225349e418bd42735e70aa3f193fec6709
 ## How to create a challenge on EvalAI?
 
 If you are looking for a simple challenge configuration that you can replicate to create a challenge on EvalAI, then you are at the right place. Follow the instructions given below to get started.
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ __pycache__ @@
     <<<<<<< HEAD
     myenv/
     =======
-    >>>>>>> 5c5278225349e418bd42735e70aa3f193fec6709