search

CommerceDataService / DataService_WebSite

The website for the Commerce Data Service - A startup within the Department of Commerce
https://www.commerce.gov/dataservice
2 stars 8 forks source link

Made changes to deal with initial merge conflict #26

Closed maabrown closed 8 years ago

maabrown commented 8 years ago

CDS production couldn't be merged with CDS develop so:

  1. I pulled production into my own production branch
  2. Merged it with my develop branch
  3. Pushed develop branch to my GitHub repo
  4. Merging my develop branch with CDS develop branch