projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2170 from TheBlueMatt/2023-04-silent-merge-conflict
[rust-lightning]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index c2c882ddf49b8dd4032826867eed5bc28cbffddb..7a889b5b8230af929cd28134454d2f93502531bd 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,6
+1,13
@@
/target/
/target/
+c-bindings-gen/target/
+lightning-c-bindings/target/
+lightning-c-bindings/a.out
+/hfuzz_target/
+/net-tokio/target/
**/*.rs.bk
Cargo.lock
**/*.rs.bk
Cargo.lock
-/target/
-**/*.rs.bk
-.idea
\ No newline at end of file
+.idea
+lightning/target
+lightning/ldk-net_graph-*.bin
+lightning-custom-message/target
+no-std-check/target