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

Branch1 #7

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Branch1 #7

wants to merge 5 commits into from

Commits on Nov 29, 2021

  1. NewClass Added

    @Shadman268
    Shadman268 committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    6d664bd View commit details
    Browse the repository at this point in the history

  2. Another Class added in Branch1

    @Shadman268
    Shadman268 committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    5c6de5b View commit details
    Browse the repository at this point in the history

  3. conflict file added in branch1

    @Shadman268
    Shadman268 committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    195ecdc View commit details
    Browse the repository at this point in the history

  4. Update conflict.txt

    @Shadman268
    Shadman268 authored Nov 29, 2021
    Configuration menu
    Copy the full SHA
    e0f9120 View commit details
    Browse the repository at this point in the history

  5. Update AnotherClass.java

    @Shadman268
    Shadman268 authored Nov 29, 2021
    Configuration menu
    Copy the full SHA
    bf8c032 View commit details
    Browse the repository at this point in the history