{
	"authors": [ "baker" ],
	"dependencies": {
		"Bakery.Caching": "0.12",
		"Bakery.Logging": "0.12",
		"Bakery.Mail": "0.12",
		"Bakery.Mail.MailKit": "0.12",
		"Bakery.Properties": "0.12",
		"Bakery.Security": "0.12",
		"Bakery.Text": "0.12",
		"Bakery.Text.Json": "0.12",
		"Bakery.Time": "0.12",
		"Bakery.Uuid": "0.12",
		"NETStandard.Library": "1.6.1"
	},
	"description": "Bakery Class Library",
	"frameworks": {
		"netstandard1.5": {
			"imports": "dnxcore50"
		}
	},
	"packOptions": {
		"repository": {
			"type": "git",
			"url": "http://github.com/brendanjbaker/bakery"
		}
	},
	"version": "0.12"
}

{
	"authors": [ "baker" ],
	"dependencies": {
		"Bakery.Caching": "0.12",
		"Bakery.Logging": "0.12",
		"Bakery.Mail": "0.12",
		"Bakery.Mail.MailKit": "0.12",
		"Bakery.Properties": "0.12",
		"Bakery.Security": "0.12",
		"Bakery.Text": "0.12",
		"Bakery.Text.Json": "0.12",
		"Bakery.Time": "0.12",
		"Bakery.Uuid": "0.12",
		"NETStandard.Library": "1.6.1"
	},
	"description": "Bakery Class Library",
	"frameworks": {
		"netstandard1.5": {
			"imports": "dnxcore50"
		}
	},
	"packOptions": {
		"repository": {
			"type": "git",
			"url": "http://github.com/brendanjbaker/bakery"
		}
	},
	"version": "0.12"
}

Resolve merge conflict re: version.
Resolve merge conflict re: version.
