Skip to content

Commit 2b28ebe

Browse files
committed
my changes
1 parent 7aa4699 commit 2b28ebe

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

notebooks/v2/intro_to_data_science/Data_Commons_For_Data_Science_Tutorial.ipynb

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,7 @@
283283
},
284284
{
285285
"cell_type": "code",
286-
<<<<<<< HEAD:notebooks/intro_data_science/v2/Data_Commons_For_Data_Science_Tutorial.ipynb
287-
"execution_count": null,
288-
=======
289286
"execution_count": 20,
290-
>>>>>>> bcab3e26ad8dc5427abd4db38ecb5f26109b1821:notebooks/v2/intro_to_data_science/Data_Commons_For_Data_Science_Tutorial.ipynb
291287
"metadata": {
292288
"colab": {
293289
"base_uri": "https://localhost:8080/"
@@ -306,12 +302,8 @@
306302
],
307303
"source": [
308304
"stat_vars = dc_client.observation.fetch_available_statistical_variables(entity_dcids=['geoId/06001', 'geoId/06003', 'geoId/06005', 'geoId/06007'])\n",
309-
<<<<<<< HEAD:notebooks/intro_data_science/v2/Data_Commons_For_Data_Science_Tutorial.ipynb
310305
"for dcid, vars in stat_vars.items():\n",
311306
" print(dcid, vars[:5])"
312-
=======
313-
"print(stat_vars)"
314-
>>>>>>> bcab3e26ad8dc5427abd4db38ecb5f26109b1821:notebooks/v2/intro_to_data_science/Data_Commons_For_Data_Science_Tutorial.ipynb
315307
]
316308
},
317309
{
@@ -320,12 +312,7 @@
320312
"id": "BRz43ETvSN1F"
321313
},
322314
"source": [
323-
<<<<<<< HEAD:notebooks/intro_data_science/v2/Data_Commons_For_Data_Science_Tutorial.ipynb
324315
"Let's compile a list of some statvars of interest."
325-
=======
326-
"Let's some statvars of interest.\n",
327-
"\n"
328-
>>>>>>> bcab3e26ad8dc5427abd4db38ecb5f26109b1821:notebooks/v2/intro_to_data_science/Data_Commons_For_Data_Science_Tutorial.ipynb
329316
]
330317
},
331318
{
@@ -1909,4 +1896,4 @@
19091896
},
19101897
"nbformat": 4,
19111898
"nbformat_minor": 0
1912-
}
1899+
}

0 commit comments

Comments
 (0)