Merge pull request #16 from pnnl/develop

Develop

Author: brendapraggastis

.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
 gitmerge.sh
 dist
-hypernetx.egg-info
+hypernetx.egg-info
+logfiles/
+stashmerge.sh

DISCLAIMER.txt

@@ -0,0 +1,22 @@
+This material was prepared as an account of work sponsored by an agency of the
+United States Government.  Neither the United States Government nor the United
+States Department of Energy, nor Battelle, nor any of their employees, nor any
+jurisdiction or organization that has cooperated in the development of these
+materials, makes any warranty, express or implied, or assumes any legal
+liability or responsibility for the accuracy, completeness, or usefulness or
+any information, apparatus, product, software, or process disclosed, or
+represents that its use would not infringe privately owned rights.
+
+Reference herein to any specific commercial product, process, or service by
+trade name, trademark, manufacturer, or otherwise does not necessarily
+constitute or imply its endorsement, recommendation, or favoring by the United
+States Government or any agency thereof, or Battelle Memorial Institute. The
+views and opinions of authors expressed herein do not necessarily state or
+reflect those of the United States Government or any agency thereof.
+
+		 PACIFIC NORTHWEST NATIONAL LABORATORY
+			      operated by
+				BATTELLE
+				for the
+		   UNITED STATES DEPARTMENT OF ENERGY
+		    under Contract DE-AC05-76RL01830

README.md

@@ -98,8 +98,4 @@ License
 
 Released under the 3-Clause BSD license (see License.rst)
 
-Notice
-------
-This material was prepared as an account of work sponsored by an agency of the United States Government.  Neither the United States Government nor the United States Department of Energy, nor Battelle, nor any of their employees, nor any jurisdiction or organization that has cooperated in the development of these materials, makes any warranty, express or implied, or assumes any legal liability or responsibility for the accuracy, completeness, or usefulness or any information, apparatus, product, software, or process disclosed, or represents that its use would not infringe privately owned rights.
-Reference herein to any specific commercial product, process, or service by trade name, trademark, manufacturer, or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United States Government or any agency thereof, or Battelle Memorial Institute. The views and opinions of authors expressed herein do not necessarily state or reflect those of the United States Government or any agency thereof.
 

README.rst

@@ -99,9 +99,5 @@ License
 
 Released under the 3-Clause BSD license (see :ref:`license`)
 
-Notice
-------
-This material was prepared as an account of work sponsored by an agency of the United States Government.  Neither the United States Government nor the United States Department of Energy, nor Battelle, nor any of their employees, nor any jurisdiction or organization that has cooperated in the development of these materials, makes any warranty, express or implied, or assumes any legal liability or responsibility for the accuracy, completeness, or usefulness or any information, apparatus, product, software, or process disclosed, or represents that its use would not infringe privately owned rights.
-Reference herein to any specific commercial product, process, or service by trade name, trademark, manufacturer, or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United States Government or any agency thereof, or Battelle Memorial Institute. The views and opinions of authors expressed herein do not necessarily state or reflect those of the United States Government or any agency thereof.
 
 

docs/build/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: ada116df8ac3aed05d3fffeba82a4a72
+config: c8e13f7db8cf9bc74590b2bdc1fee533
 tags: 645f666f9bcd5a90fca523b33c5a78b7