Projects >> WikipediaMobileJ2ME >>f72936d80fe38e826026ca0f84a691f619e1434b

Chunk
Conflicting content 
                                Display.getInstance().editString(ev.getComponent(), myText.getMaxSize(), myText.getConstraint(), myText.getText());
                            }
                        }
<<<<<<< HEAD
=======
                        //System.out.println("test: "+ev.getKeyEvent());
>>>>>>> 126062ecf56d38a55e7643ba8bdecf8847679f0f
                    }
                });
Solution content 
                                Display.getInstance().editString(ev.getComponent(), myText.getMaxSize(), myText.getConstraint(), myText.getText());
                            }
                        }
                    }
                });
File
MainPage.java
Developer's decision
Version 1
Kind of conflict
Comment