Acquire Page Update and Edits

[phantomhaircuts]

Hey all,
Revised the content on the Steps on how to get your criminal record.
Let me know if there are any edits or anything else I can contribute to the project.

[brianek]

Hi Erik. Your merge has conflicts. Meaning the edits you made were not on
the most recent files. Would you mind downloading the files again and
making the edits to the most updated files?

On Sun, Sep 13, 2015 at 1:00 PM, Erik Anderson [email protected]
wrote:

Hey all,
Revised the content on the Steps on how to get your criminal record.
Let me know if there are any edits or anything else I can contribute to

the project.

You can view, comment on, or merge this pull request online at:

#139
Commit Summary

• Revised and Styled Acquire content
• Acquire Page Updated and Edited

File Changes

• M css/app.css
  https://github.com/codefordc/clean-slate/pull/139/files#diff-0 (108)
• M data/combined-flow.json
  https://github.com/codefordc/clean-slate/pull/139/files#diff-1 (8)
• M js/app.js
  https://github.com/codefordc/clean-slate/pull/139/files#diff-2 (2)
• M views/acquire.html
  https://github.com/codefordc/clean-slate/pull/139/files#diff-3 (54)

Patch Links:

• https://github.com/codefordc/clean-slate/pull/139.patch
• https://github.com/codefordc/clean-slate/pull/139.diff

—
Reply to this email directly or view it on GitHub
#139.

[brianek]

There are merge conflicts in this file. Anyway you could resolve those? Quickest way is to download most update files from github and quickly make changes and submit pull request (i.e. that you are submitting on most recent files).