file_conflict_resolved

selamw1 · selamw1 · commit 741d1811191a · 2024-12-04T17:01:33.000-08:00
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -68,6 +68,7 @@
     'data_loaders_on_cpu_with_jax.md',
     'data_loaders_for_multi_device_setups_with_jax.md',
     'data_loaders_on_gpu_with_jax.md',
+    'data_loaders_for_multi_device_setups_with_jax.md',
 ]
 
 suppress_warnings = [
@@ -107,4 +108,5 @@
     'data_loaders_on_cpu_with_jax.ipynb',
     'data_loaders_for_multi_device_setups_with_jax.ipynb',
     'data_loaders_on_gpu_with_jax.ipynb',
+    'data_loaders_for_multi_device_setups_with_jax.ipynb',
 ]
diff --git a/docs/source/tutorials.md b/docs/source/tutorials.md
@@ -26,6 +26,7 @@ JAX_transformer_text_classification
 data_loaders_on_cpu_with_jax
 data_loaders_for_multi_device_setups_with_jax
 data_loaders_on_gpu_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
`@@ -68,6 +68,7 @@`
`68`	`68`	`'data_loaders_on_cpu_with_jax.md',`
`69`	`69`	`'data_loaders_for_multi_device_setups_with_jax.md',`
`70`	`70`	`'data_loaders_on_gpu_with_jax.md',`
	`71`	`+ 'data_loaders_for_multi_device_setups_with_jax.md',`
`71`	`72`	`]`
`72`	`73`
`73`	`74`	`suppress_warnings = [`
`@@ -107,4 +108,5 @@`
`107`	`108`	`'data_loaders_on_cpu_with_jax.ipynb',`
`108`	`109`	`'data_loaders_for_multi_device_setups_with_jax.ipynb',`
`109`	`110`	`'data_loaders_on_gpu_with_jax.ipynb',`
	`111`	`+ 'data_loaders_for_multi_device_setups_with_jax.ipynb',`
`110`	`112`	`]`