Skip to content

Resolve the merge-conflict markers committed in .gitignore #8

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

Merged
thedavidmeister merged 1 commit into from
Aug 23, 2026
Merged

Resolve the merge-conflict markers committed in .gitignore #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ result
dependencies
remappings.txt
.pre-commit-config.yaml
<<<<<<< HEAD
target

# `subgraph/networks.json` is the only file this repo owns under `subgraph/`.
# The `Subgraph manual deploy` workflow fetches the SOURCE from rain.metadata
Expand All @@ -15,6 +15,3 @@ remappings.txt
# transient and none of it is this repo's to commit.
/subgraph/*
!/subgraph/networks.json
=======
target
>>>>>>> origin/main
Loading