Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix conflicts

  • Loading branch information...
commit 02c08c7f1f66f8b71f22cdd7390b3d71a3790b9f 1 parent 8a06094
@SpearThruster authored
View
2  gen/com/actionbarsherlock/R.java
@@ -755,7 +755,6 @@ is along the minor axis (that is the screen is portrait). This may
public static final int arrow_down=0x7f020056;
public static final int arrow_up=0x7f020057;
public static final int bg_auto_complete=0x7f020058;
- public static final int widget_sunny=0x7f020063;
public static final int bullet=0x7f020059;
public static final int cloud=0x7f02005a;
public static final int ic_arrow_up=0x7f02005b;
@@ -768,6 +767,7 @@ is along the minor axis (that is the screen is portrait). This may
public static final int sun=0x7f020062;
public static final int weather_clear=0x7f020063;
public static final int widget_bg_2row_blue=0x7f020064;
+ public static final int widget_sunny=0x7f020065;
}
public static final class id {
public static final int abs__action_bar=0x7f05001d;
View
15 gen/finki/bmt/weather/R.java
@@ -755,19 +755,6 @@ is along the minor axis (that is the screen is portrait). This may
public static final int arrow_down=0x7f020056;
public static final int arrow_up=0x7f020057;
public static final int bg_auto_complete=0x7f020058;
-<<<<<<< HEAD
- public static final int cloud=0x7f020059;
- public static final int ic_arrow_up=0x7f02005a;
- public static final int ic_launcher=0x7f02005b;
- public static final int ic_refresh=0x7f02005c;
- public static final int ic_refresh_inverse=0x7f02005d;
- public static final int ic_trash=0x7f02005e;
- public static final int ic_trash_inverse=0x7f02005f;
- public static final int standard_bg_metal=0x7f020060;
- public static final int weather_clear=0x7f020061;
- public static final int widget_bg_2row_blue=0x7f020062;
- public static final int widget_sunny=0x7f020063;
-=======
public static final int bullet=0x7f020059;
public static final int cloud=0x7f02005a;
public static final int ic_arrow_up=0x7f02005b;
@@ -780,7 +767,7 @@ is along the minor axis (that is the screen is portrait). This may
public static final int sun=0x7f020062;
public static final int weather_clear=0x7f020063;
public static final int widget_bg_2row_blue=0x7f020064;
->>>>>>> 190137d947d7e3ae059d0f7abbbbc46ffb720e59
+ public static final int widget_sunny=0x7f020065;
}
public static final class id {
public static final int abs__action_bar=0x7f05001d;
View
BIN  res/drawable/sun.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.