overriding master

web-archive-group · Nov 11, 2016 · 1fff3ea · 1fff3ea
2 parents c3ad1c9 + 95aae86
commit 1fff3ea
Showing 1 changed file with 33 additions and 0 deletions.
diff --git a/Scripts/compare_collection/UA_Compare.ipynb b/Scripts/compare_collection/UA_Compare.ipynb
@@ -404,11 +404,15 @@
   },
   {
    "cell_type": "code",
+<<<<<<< HEAD
 <<<<<<< Updated upstream
    "execution_count": null,
 =======
    "execution_count": 21,
 >>>>>>> Stashed changes
+=======
+   "execution_count": null,
+>>>>>>> 95aae86bfd4447539c5e0156f5bd102c92f92497
    "metadata": {
     "collapsed": false
    },
@@ -417,6 +421,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
+<<<<<<< HEAD
 <<<<<<< Updated upstream
       "['FLOODS_201', 'HUMANITIES', 'FRANCOPHON', 'WEBARCHIVE', 'HEALTH_SCI', 'ENERGY_ENV', 'IDLENOMORE', 'BUSINESS_G', 'EDUCATION_', 'PRAIRIE_PR']\n"
      ]
@@ -446,6 +451,10 @@
      "metadata": {},
      "output_type": "execute_result"
 >>>>>>> Stashed changes
+=======
+      "['FLOODS_201', 'HUMANITIES', 'FRANCOPHON', 'WEBARCHIVE', 'HEALTH_SCI', 'ENERGY_ENV', 'IDLENOMORE', 'BUSINESS_G', 'EDUCATION_', 'PRAIRIE_PR']\n"
+     ]
+>>>>>>> 95aae86bfd4447539c5e0156f5bd102c92f92497
     }
    ],
    "source": [
@@ -454,6 +463,7 @@
   },
   {
    "cell_type": "code",
+<<<<<<< HEAD
 <<<<<<< Updated upstream
    "execution_count": null,
    "metadata": {
@@ -497,12 +507,20 @@
     }
    ],
 >>>>>>> Stashed changes
+=======
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+>>>>>>> 95aae86bfd4447539c5e0156f5bd102c92f92497
    "source": [
     "Compare (collection_var2[-3])#2014"
    ]
   },
   {
    "cell_type": "code",
+<<<<<<< HEAD
 <<<<<<< Updated upstream
    "execution_count": null,
    "metadata": {
@@ -547,12 +565,20 @@
     }
    ],
 >>>>>>> Stashed changes
+=======
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+>>>>>>> 95aae86bfd4447539c5e0156f5bd102c92f92497
    "source": [
     "Compare(collection_var2[-2]) #2015"
    ]
   },
   {
    "cell_type": "code",
+<<<<<<< HEAD
 <<<<<<< Updated upstream
    "execution_count": null,
    "metadata": {
@@ -597,6 +623,13 @@
     }
    ],
 >>>>>>> Stashed changes
+=======
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+>>>>>>> 95aae86bfd4447539c5e0156f5bd102c92f92497
    "source": [
     "Compare(collection_var2[-1]) #2016"
    ]