Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement conflict handling #109

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Implement conflict handling #109

wants to merge 3 commits into from

Commits on Sep 2, 2019

  1. Implement conflict handling

    @pauloxnet
    pauloxnet committed Sep 2, 2019
    Configuration menu
    Copy the full SHA
    dde4a37 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. Merge branch 'master' into feature/91-conflict-update

    @pauloxnet
    pauloxnet committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    9ff9306 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2021

  1. Merge branch 'california-civic-data-coalition:master' into feature/91… 

    …-conflict-update
    @pauloxnet
    pauloxnet committed May 10, 2021
    Configuration menu
    Copy the full SHA
    b98d934 View commit details
    Browse the repository at this point in the history