Projects >> open-keychain >>f99b7585fc14e1f479f4b86f2444dcd14ba103f9

Chunk
Conflicting content
                }
                                }
                            }
                        });
<<<<<<< HEAD
                // setCalendarViewShown() is supported from API 11 onwards.
                if (android.os.Build.VERSION.SDK_INT >= 11)
                    // Hide calendarView in tablets because of the unix warparound bug.
                    dialog.getDatePicker().setCalendarViewShown(false);
=======
                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
                    if ( dialog != null && mCreatedDate != null ) {
                        dialog.getDatePicker().setMinDate(mCreatedDate.getTime().getTime()+ DateUtils.DAY_IN_MILLIS);
                    } else {
                        //When created date isn't available
                        dialog.getDatePicker().setMinDate(date.getTime().getTime()+ DateUtils.DAY_IN_MILLIS);
                    }
>>>>>>> 9646a3d4719acaffeeb74268f4f4c469a51df45c
                dialog.show();
            }
        });
Solution content
                                }
                            }
                        });

                // setCalendarViewShown() is supported from API 11 onwards.
                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB)
                    // Hide calendarView in tablets because of the unix warparound bug.
                    dialog.getDatePicker().setCalendarViewShown(false);

                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
                    if ( dialog != null && mCreatedDate != null ) {
                        dialog.getDatePicker().setMinDate(mCreatedDate.getTime().getTime()+ DateUtils.DAY_IN_MILLIS);
                    } else {
                        //When created date isn't available
                        dialog.getDatePicker().setMinDate(date.getTime().getTime()+ DateUtils.DAY_IN_MILLIS);
                    }
                }

                dialog.show();
            }
        });
File
KeyEditor.java
Developer's decision
Manual
Kind of conflict
Comment
If statement