From 83faf52421a9da447df192be86138b4d82b6ae31 Mon Sep 17 00:00:00 2001 From: Tekaoh <45337851+Tekaoh@users.noreply.github.com> Date: Wed, 4 Nov 2020 14:24:58 -0500 Subject: [PATCH] Turns out I shouldn't have tracked this one The client will edit this file on its own, so I'm removing it in order to avoid any potential future merge conflicts --- .gitignore | 57 ++++++++++++++++++++------------------ local_machine_options.iff | Bin 14442 -> 0 bytes 2 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 local_machine_options.iff diff --git a/.gitignore b/.gitignore index 31e6be88..a4c29489 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,30 @@ -// Ignore some directories that aren't client assets -miles/ -mozilla/ -profiles/ -screenshots/ - -// Ignore some text files generated by the client -characterlist_*.txt -ui.log - -// Ignore tables of contents. These are in the client zip -*.toc - -// Ignore tree files EXCEPT any specifically created by the SWG Source project -*.tre -!swgsource_3.0.tre - -// Ignore some cfg files that the player (or SwgClientSetup_r.exe) might like to edit -live.cfg -login.cfg -options.cfg -preload.cfg -user.cfg - -// Ignore stuff for interacting with the repository -PortableGit/ -UpdateSwgClient.bat +// Ignore some directories that aren't client assets +miles/ +mozilla/ +profiles/ +screenshots/ + +// Ignore some text files generated by the client +characterlist_*.txt +ui.log + +// Ignore tables of contents. These are in the client zip +*.toc + +// Ignore tree files EXCEPT any specifically created by the SWG Source project +*.tre +!swgsource_3.0.tre + +// Ignore some cfg files that the player (or SwgClientSetup_r.exe) might like to edit +live.cfg +login.cfg +options.cfg +preload.cfg +user.cfg + +// Ignore a file that the client will want to edit +local_machine_options.iff + +// Ignore stuff for interacting with the repository +PortableGit/ +UpdateSwgClient.bat diff --git a/local_machine_options.iff b/local_machine_options.iff deleted file mode 100644 index d90d8e37303694d6616c7008140be790734eab91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14442 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