Merge pull request #1764 from Gol-D-Ace/remove_and_ignore_obs.rc

UI: Remove and ignore obs.rc
This commit is contained in:
Jim 2019-03-19 19:23:17 -07:00 committed by GitHub
commit a0ea389789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions

1
.gitignore vendored
View File

@ -36,6 +36,7 @@ x64/
ipch/
GeneratedFiles/
.moc/
/UI/obs.rc
/other/

View File

@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "../cmake/winrc/obs-studio.ico"