file_conflict_resolved

selamw1 · selamw1 · commit d0e388a71c3e · 2024-12-04T14:03:23.000-08:00
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -66,6 +66,7 @@
     'JAX_time_series_classification.md',
     'JAX_transformer_text_classification.md',
     'data_loaders_on_cpu_with_jax.md',
+    'data_loaders_for_multi_device_setups_with_jax.md',
 ]
 
 suppress_warnings = [
@@ -102,4 +103,5 @@
     'JAX_time_series_classification.ipynb',
     'JAX_transformer_text_classification.ipynb',
     'data_loaders_on_cpu_with_jax.ipynb',
+    'data_loaders_for_multi_device_setups_with_jax.ipynb',
 ]
diff --git a/docs/source/tutorials.md b/docs/source/tutorials.md
@@ -24,6 +24,7 @@ JAX_image_captioning
 JAX_time_series_classification
 JAX_transformer_text_classification
 data_loaders_on_cpu_with_jax
+data_loaders_for_multi_device_setups_with_jax
 ```
 
 Once you've gone through this content, you can refer to package-specific

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@`
`66`	`66`	`'JAX_time_series_classification.md',`
`67`	`67`	`'JAX_transformer_text_classification.md',`
`68`	`68`	`'data_loaders_on_cpu_with_jax.md',`
	`69`	`+ 'data_loaders_for_multi_device_setups_with_jax.md',`
`69`	`70`	`]`
`70`	`71`
`71`	`72`	`suppress_warnings = [`
`@@ -102,4 +103,5 @@`
`102`	`103`	`'JAX_time_series_classification.ipynb',`
`103`	`104`	`'JAX_transformer_text_classification.ipynb',`
`104`	`105`	`'data_loaders_on_cpu_with_jax.ipynb',`
	`106`	`+ 'data_loaders_for_multi_device_setups_with_jax.ipynb',`
`105`	`107`	`]`