Revert "Tried to change version."

This reverts commit eb3bd6b.
forkgram · Jun 30, 2017 · 63fc0df · 63fc0df
1 parent 3ed4c73
commit 63fc0df
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
@@ -34,13 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
-<<<<<<< HEAD
  FILEVERSION 1,1,9,0
  PRODUCTVERSION 1,1,9,0
-=======
- FILEVERSION 1,1,7,5
- PRODUCTVERSION 1,1,7,5
->>>>>>> Tried to change version.
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
@@ -25,13 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
-<<<<<<< HEAD
  FILEVERSION 1,1,9,0
  PRODUCTVERSION 1,1,9,0
-=======
- FILEVERSION 1,1,7,5
- PRODUCTVERSION 1,1,7,5
->>>>>>> Tried to change version.
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L