file_conflict_resolved

selamw1 · selamw1 · commit 59a066f6d36a · 2024-12-04T17:31:33.000-08:00
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -69,6 +69,7 @@
     'data_loaders_on_gpu_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 = [
@@ -109,4 +110,5 @@
     'data_loaders_on_gpu_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
@@ -27,6 +27,7 @@ data_loaders_on_cpu_with_jax
 data_loaders_on_gpu_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
`@@ -69,6 +69,7 @@`
`69`	`69`	`'data_loaders_on_gpu_with_jax.md',`
`70`	`70`	`'data_loaders_for_multi_device_setups_with_jax.md',`
`71`	`71`	`'data_loaders_on_gpu_with_jax.md',`
	`72`	`+ 'data_loaders_for_multi_device_setups_with_jax.md',`
`72`	`73`	`]`
`73`	`74`
`74`	`75`	`suppress_warnings = [`
`@@ -109,4 +110,5 @@`
`109`	`110`	`'data_loaders_on_gpu_with_jax.ipynb',`
`110`	`111`	`'data_loaders_for_multi_device_setups_with_jax.ipynb',`
`111`	`112`	`'data_loaders_on_gpu_with_jax.ipynb',`
	`113`	`+ 'data_loaders_for_multi_device_setups_with_jax.ipynb',`
`112`	`114`	`]`