fiexed version number

415c84b1 · ylwu · e9f7d45c · 415c84b1
Commit 415c84b1 authored Jul 11, 2012 by ylwu
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

appinventor/components/src/com/google/appinventor/components/common/YaVersion.java ...c/com/google/appinventor/components/common/YaVersion.java +4 -5

No files found.
--- a/appinventor/components/src/com/google/appinventor/components/common/YaVersion.java
+++ b/appinventor/components/src/com/google/appinventor/components/common/YaVersion.java
@@ -175,13 +175,12 @@ public class YaVersion {
  // For YOUNG_ANDROID_VERSION 57:
  // - PLAYER_COMPONENT_VERSION was incremented to 4.
  // For YOUNG_ANDROID_VERSION 58:
-<<<<<<< HEAD
-  // The Camcorder component was added.
-=======
  // - FORM_COMPONENT_VERSION was incremented to 7.
->>>>>>> 135acbca7522f0027117263d88507b955cdc55f4
+  // For YOUNG_ANDROID_VERSION 59:
+  //The Camcorder component was added.

-  public static final int YOUNG_ANDROID_VERSION = 58;
+
+  public static final int YOUNG_ANDROID_VERSION = 59;

  // ............................... Blocks Language Version Number ...............................