diff options
| author | Cameron Schermerhorn <cameron.schermerhorn@its.ny.gov> | 2015-10-09 13:31:48 -0400 |
|---|---|---|
| committer | Cameron Schermerhorn <cameron.schermerhorn@its.ny.gov> | 2015-10-09 13:31:48 -0400 |
| commit | 35e89f86fe21eb2a1246357184628595f8edca5d (patch) | |
| tree | ebd83fc365a774b5de6057c7fd7bd570b11d2623 /xml.html.markdown | |
| parent | d2010c08604c25b3166977e0cde795732ecde551 (diff) | |
Resolve merge conflict with master
+ added name back to contributor list
Diffstat (limited to 'xml.html.markdown')
0 files changed, 0 insertions, 0 deletions