Skip to content
This repository has been archived by the owner. It is now read-only.

Resolving Merge Conflict #131

Merged
merged 2 commits into from Dec 10, 2015
Merged

Resolving Merge Conflict #131

merged 2 commits into from Dec 10, 2015

Commits on Dec 7, 2015

  1. Merge conflict

    @jmr06005
    jmr06005 committed Dec 7, 2015
    Copy the full SHA
    78fedb3 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2015

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	user-people.php
    @jmr06005
    jmr06005 committed Dec 10, 2015
    Copy the full SHA
    3f27cc9 View commit details
    Browse the repository at this point in the history