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.

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

240928_conflict merge #487

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

240928_conflict merge #487

wants to merge 43 commits into from

Commits on Dec 31, 2023

  1. Update data.yml

    jooneui authored Dec 31, 2023
    Configuration menu
    Copy the full SHA
    e399ab7 View commit details
    Browse the repository at this point in the history
  2. Update data.yml

    jooneui authored Dec 31, 2023
    Configuration menu
    Copy the full SHA
    c55a2d0 View commit details
    Browse the repository at this point in the history
  3. Update data.yml

    jooneui authored Dec 31, 2023
    Configuration menu
    Copy the full SHA
    f29f72c View commit details
    Browse the repository at this point in the history
  4. Update data.yml

    jooneui authored Dec 31, 2023
    Configuration menu
    Copy the full SHA
    b584b7f View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Update _config.yml

    jooneui authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    2c72920 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2024

  1. Update data.yml

    jooneui authored Sep 28, 2024
    Configuration menu
    Copy the full SHA
    bf269f7 View commit details
    Browse the repository at this point in the history
  2. Update index.html

    jooneui authored Sep 28, 2024
    Configuration menu
    Copy the full SHA
    45cd0c1 View commit details
    Browse the repository at this point in the history
  3. Create research.md

    jooneui authored Sep 28, 2024
    Configuration menu
    Copy the full SHA
    c6e458d View commit details
    Browse the repository at this point in the history
  4. Create publication.md

    jooneui authored Sep 28, 2024
    Configuration menu
    Copy the full SHA
    3faf493 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. Updated data.yml and content

    jooneuih committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    e4e1504 View commit details
    Browse the repository at this point in the history
  2. Update data.yml

    jooneui authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    b2eec71 View commit details
    Browse the repository at this point in the history
  3. Update data.yml

    jooneui authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    5483510 View commit details
    Browse the repository at this point in the history
  4. Update data.yml

    jooneui authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    77d620b View commit details
    Browse the repository at this point in the history
  5. Update data.yml

    jooneui authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    470d035 View commit details
    Browse the repository at this point in the history
  6. Update data.yml

    jooneui authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    022e8d3 View commit details
    Browse the repository at this point in the history
  7. Update index.html

    jooneui authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    1525e78 View commit details
    Browse the repository at this point in the history
  8. Update index.html

    jooneui authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    a7a2431 View commit details
    Browse the repository at this point in the history
  9. Update index.html

    jooneui authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    56fcaf5 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Update data.yml

    jooneui authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    3b08eb3 View commit details
    Browse the repository at this point in the history
  2. Update data.yml

    jooneui authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    f6afa3d View commit details
    Browse the repository at this point in the history
  3. Update data.yml

    jooneui authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    8de38bc View commit details
    Browse the repository at this point in the history
  4. Update data.yml

    jooneui authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    4d5a06e View commit details
    Browse the repository at this point in the history
  5. Update data.yml

    jooneui authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    05f3414 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    eb5b7d7 View commit details
    Browse the repository at this point in the history
  7. Update data.yml

    jooneui authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    cae4549 View commit details
    Browse the repository at this point in the history
  8. Update data.yml

    jooneui authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    68603fd View commit details
    Browse the repository at this point in the history
  9. Update data.yml

    jooneui authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    24855df View commit details
    Browse the repository at this point in the history
  10. Update data.yml

    jooneui authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    2d9bde6 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Update data.yml

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    25462b0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1d1b106 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a923657 View commit details
    Browse the repository at this point in the history
  4. Update data.yml

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    ecc2df8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    84648cc View commit details
    Browse the repository at this point in the history
  6. Update data.yml

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    392ace2 View commit details
    Browse the repository at this point in the history
  7. Update data.yml

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    b920842 View commit details
    Browse the repository at this point in the history
  8. Update data.yml

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    8f154d7 View commit details
    Browse the repository at this point in the history
  9. Create researchints

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    21eb767 View commit details
    Browse the repository at this point in the history
  10. Create researchints.html

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    1997fe9 View commit details
    Browse the repository at this point in the history
  11. Update data.yml

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    0464680 View commit details
    Browse the repository at this point in the history
  12. Update researchints.html

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    f1be1fc View commit details
    Browse the repository at this point in the history
  13. Update data.yml

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    75afb57 View commit details
    Browse the repository at this point in the history
  14. Update data.yml

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    54472ad View commit details
    Browse the repository at this point in the history
  15. Update data.yml

    jooneui authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    67f80d4 View commit details
    Browse the repository at this point in the history