Resolved merge conflict in .gitmodules
Browse files- .gitmodules +6 -0
- timeseries-1mn-stocks +1 -0
.gitmodules
CHANGED
|
@@ -37,6 +37,12 @@
|
|
| 37 |
[submodule "lettuce_growth"]
|
| 38 |
path = lettuce_growth
|
| 39 |
url = https://huggingface.co/datasets/bromleyp/lettuce_growth
|
|
|
|
| 40 |
[submodule "avocado_prices"]
|
| 41 |
path = avocado_prices
|
| 42 |
url = https://huggingface.co/datasets/bromleyp/avocado_prices
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 37 |
[submodule "lettuce_growth"]
|
| 38 |
path = lettuce_growth
|
| 39 |
url = https://huggingface.co/datasets/bromleyp/lettuce_growth
|
| 40 |
+
<<<<<<< HEAD
|
| 41 |
[submodule "avocado_prices"]
|
| 42 |
path = avocado_prices
|
| 43 |
url = https://huggingface.co/datasets/bromleyp/avocado_prices
|
| 44 |
+
=======
|
| 45 |
+
[submodule "timeseries-1mn-stocks"]
|
| 46 |
+
path = timeseries-1mn-stocks
|
| 47 |
+
url = https://huggingface.co/datasets/humun-research/timeseries-1mn-stocks
|
| 48 |
+
>>>>>>> 405e5ac8777eef32d494d9c3a4ec9a0377ea3801
|
timeseries-1mn-stocks
ADDED
|
@@ -0,0 +1 @@
|
|
|
|
|
|
|
| 1 |
+
Subproject commit f01a13ba85959aaf0fe13ab2148fcbf1f5c4ce0c
|