fix merge issue; refactoring

spring-mvc-java/src/test/java/com/baeldung/config/TestConfig.java

@@ -0,0 +1,11 @@
+package com.baeldung.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+
+@Configuration
+@ComponentScan(basePackages = { "com.baeldung.dao", "com.baeldung.aop", "com.baeldung.events" })
+@EnableAspectJAutoProxy
+public class TestConfig {
+}