diff --git a/.git-fixfiles b/.git-fixfiles index 8d2d98a7..394f8593 100644 --- a/.git-fixfiles +++ b/.git-fixfiles @@ -1,4 +1,4 @@ #!/bin/sh git update-index --assume-unchanged cpp/prebuilt/**/*.so -git update-index --assume-unchanged cpp/iedriver/Generated/atoms.h +#git update-index --assume-unchanged cpp/iedriver/Generated/atoms.h exit 0 diff --git a/.gitignore b/.gitignore index addf95d3..8b55eabb 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,9 @@ javascript/node/selenium-webdriver/node_modules/ .idea/vcs.xml .idea/misc.xml .idea/workspace.xml +.idea/projectCodeStyle.xml +*.idea* +*.iml .idea/dictionaries/ .idea/scopes/ .idea/qaplug_profiles.xml @@ -66,4 +69,4 @@ GSYMS GTAGS .project Gemfile.lock -/rb/.bundle \ No newline at end of file +/rb/.bundle diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 15ed1f4f..1e106b98 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -409,10 +409,6 @@