merge

estratos.ipynb
2024-04-18 23:08:55 +02:00 · 2024-04-18 23:07:31 +02:00
4 changed files with 7 additions and 7 deletions
--- a/Estratos.ipynb
+++ b/Estratos.ipynb
@ -1153,7 +1153,7 @@
  "kernelspec": {
   "display_name": "SageMath 10.3.rc4",
   "language": "sage",
-   "name": "sagemath-devel"
+   "name": "sagemath-devel">>>>>>> 73afa076d02f9fd4d32c496e04ee495b0ed71d29
  },
  "language_info": {
   "codemirror_mode": {
--- a/Suspension10.ipynb
+++ b/Suspension10.ipynb
@ -297,7 +297,7 @@
 ],
 "metadata": {
  "kernelspec": {
-   "display_name": "SageMath 10.3.rc3",
+   "display_name": "SageMath 10.4.beta3",
   "language": "sage",
   "name": "sagemath-310"
  },
@ -311,7 +311,7 @@
   "name": "python",
   "nbconvert_exporter": "python",
   "pygments_lexer": "ipython3",
-   "version": "3.11.1"
+   "version": "3.12.2"
  }
 },
 "nbformat": 4,
--- a/Tutorial.ipynb
+++ b/Tutorial.ipynb
@ -556,7 +556,7 @@
 ],
 "metadata": {
  "kernelspec": {
-   "display_name": "SageMath 10.3.rc1",
+   "display_name": "SageMath 10.3.rc3",
   "language": "sage",
   "name": "sagemath-310"
  },
@ -570,7 +570,7 @@
   "name": "python",
   "nbconvert_exporter": "python",
   "pygments_lexer": "ipython3",
-   "version": "3.12.2"
+   "version": "3.11.1"
  }
 },
 "nbformat": 4,
--- a/resolucion.ipynb
+++ b/resolucion.ipynb
@ -298,7 +298,7 @@
 ],
 "metadata": {
  "kernelspec": {
-   "display_name": "SageMath 10.3.rc1",
+   "display_name": "SageMath 10.3.rc3",
   "language": "sage",
   "name": "sagemath-310"
  },
@ -312,7 +312,7 @@
   "name": "python",
   "nbconvert_exporter": "python",
   "pygments_lexer": "ipython3",
-   "version": "3.12.2"
+   "version": "3.11.1"
  }
 },
 "nbformat": 4,
Author	SHA1	Message	Date
Enrique Artal	d9d991c95b	merge	2024-04-18 23:08:55 +02:00
Enrique Artal	fa6dff8d18	estratos.ipynb	2024-04-18 23:07:31 +02:00