oops, broken notebook

glass-dev · Sep 18, 2024 · ee90d3a · ee90d3a
1 parent 1a7e316
commit ee90d3a
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/examples/1-basic/density.ipynb b/examples/1-basic/density.ipynb
@@ -161,14 +161,7 @@
     "# simulate and add galaxies in each matter shell to cube\n",
     "for i, delta_i in enumerate(matter):\n",
     "    # simulate positions from matter density\n",
-<<<<<<< HEAD
-    "    for gal_lon, gal_lat, gal_count in glass.points.positions_from_delta(\n",
-    "        ngal[i], delta_i\n",
-    "    ):\n",
-=======
     "    for gal_lon, gal_lat, gal_count in glass.positions_from_delta(ngal[i], delta_i):\n",
-    "\n",
->>>>>>> a49af11 (update imports in examples)
     "        # sample redshifts uniformly in shell\n",
     "        gal_z = glass.redshifts(gal_count, ws[i])\n",
     "\n",