diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2022-10-25 10:25:04 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2022-10-25 10:25:04 +0400 |
| commit | 7ba58f7aa083116d079e07187dc314f1e37da8a1 (patch) | |
| tree | d682143d3b81d4ce04a23b431099f0a41076a361 | |
| parent | c310387dc143e3dbc1cff747079c7cd5920e29a4 (diff) | |
| download | rabbitmq-server-git-7ba58f7aa083116d079e07187dc314f1e37da8a1.tar.gz | |
Resolve a conflict
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index c16860310e..968e94a2c3 100644 --- a/.gitignore +++ b/.gitignore @@ -64,11 +64,8 @@ erl_crash.dump rebar3.crashdump .envrc -<<<<<<< HEAD -======= .exrc .ignore ->>>>>>> eb14b0af3d (Ignore `.exrc` file) *.plt *.lock |