diff options
| author | Mikhail Gorbushin <m.gorbushin@corp.mail.ru> | 2018-07-30 13:12:19 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2018-07-30 15:44:09 +0300 |
| commit | 15bdf825628f6c143d5a6e38eb8a933e7f0a4c88 (patch) | |
| tree | 9b36bfddbfa4aeb17c43f73860f7813aa6eaeaf3 /.gitignore | |
| parent | ce819c70ea91ec2c55590cd92665ddb85761f616 (diff) | |
[routing] fix conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b5acdce943..115fc78258 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,8 @@ data/drules_proto_design.bin data/colors_design.txt data/patterns_design.txt data/route_points.dat +data/bookmarks/ +data/bookmarks_backup/ # Compiled Python *.pyc @@ -174,3 +176,4 @@ designer_version.h # Vim files tags +*.sw* |