Projects >> GJAddr >>c95a786dfb220826732061dad46340c1696b8661

Chunk
Conflicting content
		setLocationRelativeTo(null);

		// open window with notifications
<<<<<<< HEAD
		List contactsWithEvent = this.db.getContactsWithEvent();
=======
		List contactsWithEvent = this.db.getContactsWithBirtday();
		contactsWithEvent.addAll(this.db.getContactsWithNameDay());
		contactsWithEvent.addAll(this.db.getContactsWithCelebration());
>>>>>>> 40c4a0cf26e91717e030e4037b55b5c3b6c93ae4
		if (contactsWithEvent.size() > 0) {
			new NotificationsWindow(contactsWithEvent);
		}
Solution content
		setLocationRelativeTo(null);

		// open window with notifications
		List contactsWithEvent = this.db.getContactsWithEvent();
		if (contactsWithEvent.size() > 0) {
            LoggerFactory.getLogger(this.getClass()).info("Opening notifications window.");
			new NotificationsWindow(contactsWithEvent);
		}
File
MainWindow.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable