SnipeitPS/CHANGELOG.md

<<<<<<< HEAD
# Change Log

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/),
and this project adheres to [Semantic Versioning](http://semver.org/).

## [1.0] - 2017-11-18
=======
[1.0]
>>>>>>> 13ec3a62ac71275ec2bbe0bbf993130e9f53589f
Merge 2017-11-19 10:57:26 +00:00			`<<<<<<< HEAD`
Update build process 2017-11-18 18:18:41 +00:00			`# Change Log`

			`All notable changes to this project will be documented in this file.`

			`The format is based on [Keep a Changelog](http://keepachangelog.com/),`
			`and this project adheres to [Semantic Versioning](http://semver.org/).`

			`## [1.0] - 2017-11-18`
Merge 2017-11-19 10:57:26 +00:00			`=======`
			`[1.0]`
			`>>>>>>> 13ec3a62ac71275ec2bbe0bbf993130e9f53589f`