Skip to content

Commit 574de61

Browse files
committed
Update .gitignore
From f8a94d7 (main): =================== (*) Update .gitignore
1 parent f8a94d7 commit 574de61

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ scripts/*~
99
scripts/*.pyc
1010
*.pyc
1111
.vscode/
12+
*ediff-merge*
1213

1314
# Distribution / packaging
1415
.Python

changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
From f8a94d7 (main):
2+
===================
3+
4+
(*) Update .gitignore
5+
16
From c43f214 (py3), d4acae2 (main):
27
==================================
38

0 commit comments

Comments
 (0)