Skip to content

Commit 25b21bc

Browse files
SaadnajmiShawn Dempsey
authored and
Shawn Dempsey
committed
Remove comment on merging stable branches -> main (microsoft#1595)
1 parent 5b5a05a commit 25b21bc

File tree

6 files changed

+0
-24
lines changed

6 files changed

+0
-24
lines changed

ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313

1414
import java.util.Map;
1515

16-
// [TODO(macOS GH#944)
17-
// Note: Be careful not to override these version numbers
18-
// when we merge upstream stable branches into main
19-
// TODO(macOS GH#944)]
2016
public class ReactNativeVersion {
2117
public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
2218
"major", 0,

ReactCommon/cxxreact/ReactNativeVersion.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
namespace facebook::react {
1616

17-
// [TODO(macOS GH#944)
18-
// Note: Be careful not to override these version numbers
19-
// when we merge upstream stable branches into main
20-
// TODO(macOS GH#944)]
2117
constexpr struct {
2218
int32_t Major = 0;
2319
int32_t Minor = 68;

scripts/versiontemplates/RCTVersion.m.template

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ NSString* const RCTVersionPatch = @"patch";
1515
NSString* const RCTVersionPrerelease = @"prerelease";
1616

1717

18-
// [TODO(macOS GH#944)
19-
// Note: Be careful not to override these version numbers
20-
// when we merge upstream stable branches into main
21-
// TODO(macOS GH#944)]
2218
NSDictionary* RCTGetReactNativeVersion(void)
2319
{
2420
static NSDictionary* __rnVersion;

scripts/versiontemplates/ReactNativeVersion.h.template

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
namespace facebook::react {
1616

17-
// [TODO(macOS GH#944)
18-
// Note: Be careful not to override these version numbers
19-
// when we merge upstream stable branches into main
20-
// TODO(macOS GH#944)]
2117
constexpr struct {
2218
int32_t Major = ${major};
2319
int32_t Minor = ${minor};

scripts/versiontemplates/ReactNativeVersion.java.template

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ import com.facebook.react.common.MapBuilder;
1313

1414
import java.util.Map;
1515

16-
// [TODO(macOS GH#944)
17-
// Note: Be careful not to override these version numbers
18-
// when we merge upstream stable branches into main
19-
// TODO(macOS GH#944)]
2016
public class ReactNativeVersion {
2117
public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
2218
"major", ${major},

scripts/versiontemplates/ReactNativeVersion.js.template

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
* @flow strict
1010
*/
1111

12-
// [TODO(macOS GH#944)
13-
// Note: Be careful not to override these version numbers
14-
// when we merge upstream stable branches into main
15-
// TODO(macOS GH#944)]
1612
exports.version = {
1713
major: ${major},
1814
minor: ${minor},

0 commit comments

Comments
 (0)