Skip to content

Commit d032dbe

Browse files
committed
small correction on GCI96 after merge
1 parent 16b22de commit d032dbe

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

CHANGELOG.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12-
<<<<<<< HEAD
1312
- [#71](https://github.com/green-code-initiative/creedengo-python/pull/71) Add rule GCI96 Require Usecols Argument in Pandas Read Functions
14-
=======
1513
- [#72](https://github.com/green-code-initiative/creedengo-python/pull/72) Add rule GCI97 Optimize square computation (scalar vs vectorized method)
16-
>>>>>>> upstream/main
1714

1815
### Changed
1916

src/main/resources/org/greencodeinitiative/creedengo/python/creedengo_way_profile.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
"GCI72",
1111
"GCI74",
1212
"GCI89",
13-
<<<<<<< HEAD
1413
"GCI96",
15-
=======
1614
"GCI97",
17-
>>>>>>> upstream/main
1815
"GCI203",
1916
"GCI404"
2017
]

0 commit comments

Comments
 (0)