diff --git a/Software/VNA_embedded/.gitignore b/Software/VNA_embedded/.gitignore index c4e810d..642f17f 100644 --- a/Software/VNA_embedded/.gitignore +++ b/Software/VNA_embedded/.gitignore @@ -1,3 +1,4 @@ /Debug/ /build/ /Release/ +.settings/language.settings.xml diff --git a/Software/VNA_embedded/.settings/language.settings.xml b/Software/VNA_embedded/.settings/language.settings.xml deleted file mode 100644 index 5fd3032..0000000 --- a/Software/VNA_embedded/.settings/language.settings.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - -<<<<<<< Updated upstream - -======= - ->>>>>>> Stashed changes - - - - - - - - - - - -<<<<<<< Updated upstream - -======= - ->>>>>>> Stashed changes - - - - - - \ No newline at end of file