summaryrefslogtreecommitdiff
path: root/resources-en/src
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2013-07-08 14:19:57 -0700
committerTor Norbye <tnorbye@google.com>2013-07-08 16:24:01 -0700
commit281f88a2e2e0454ec6d6d25e1a3e3be7cf392db6 (patch)
tree25b05c6fc84853c9d891119f7e2bd38667d8cd0d /resources-en/src
parentef7502c6805fa22f21ba2202dcc241a2c270bd4b (diff)
downloadidea-281f88a2e2e0454ec6d6d25e1a3e3be7cf392db6.tar.gz
More merge fixes
Restores a85aa2665822cbccf9d8a2762744631ac68ffad7 765c6f92a0b59c34d5a146cecd891788edc53b5d a8539f4dc6230fd9a9a2b5559f15fd7d0612d52e 45953b78139fc1565f651b571b2b9a17850e3dfb 9b4a9fe25888002718c525405ef135786c156ba7 6b0a26c7d627b9137ec98c2eb1c03639ebcbd667 I9abc64443af3a2ed65499de731943b0f7300746c (gerrit) fbdba03ca1675559232a165427ffcc6ea6b37f58 2fd6821310bed531eb4a9a14b5ceccdddc3ba9dd Change-Id: I095ab6072fc311c51305db7faa29a16e64fb9749
Diffstat (limited to 'resources-en/src')
-rw-r--r--resources-en/src/tips/Welcome.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/resources-en/src/tips/Welcome.html b/resources-en/src/tips/Welcome.html
index 7301e9483c11..6d8381a5728f 100644
--- a/resources-en/src/tips/Welcome.html
+++ b/resources-en/src/tips/Welcome.html
@@ -4,7 +4,7 @@
</head>
<body>
<h1>
- Welcome to <span class="product">&productName;</span> <span class="version">&majorVersion;</span></h1>
+ Welcome to <span class="product">&productName;</span> <span class="version">&majorVersion;.&minorVersion;<</span></h1>
<p>
You can quickly get familiar with the main features of the IDE by reading these tips. You may try out
the features described in the tips while this dialog stays open on the screen. If you close the dialog,