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

Fix conflicts with arrow-body-style #379

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

Fix conflicts with arrow-body-style #379

wants to merge 3 commits into from

Commits on Jan 22, 2021

  1. Fix conflicts with arrow-body-style

    @fisker
    fisker committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    bcdc21b View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2021

  1. Merge branch 'master' into fix-conflicts 

    # Conflicts:
#	eslint-plugin-prettier.js
    @fisker
    fisker committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    3da734d View commit details
    Browse the repository at this point in the history

  2. Simplify

    @fisker
    fisker committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    2c099c7 View commit details
    Browse the repository at this point in the history