Projects >> pmd >>fa45557845866575f2404d601b62ee371807e8fc

Chunk
Conflicting content 
									public Language languageFor(LanguageFactory lf, Properties p) { return lf.createLanguage("php"); }
									public String[] extensions() { return new String[] {".php" }; };	} },
		{"C#", 			    new LanguageConfig() {
<<<<<<< HEAD
										public Language languageFor(LanguageFactory lf, Properties p) { return lf.createLanguage("cs"); }
										public boolean ignoreLiteralsByDefault() { return false; }
										public String[] extensions() { return new String[] {".cs" }; };	} },
		{"PLSQL", 			 new LanguageConfig() {
										public Language languageFor(LanguageFactory lf, Properties p) { return lf.createLanguage("plsql"); }
										public boolean ignoreLiteralsByDefault() { return false; }
										public String[] extensions() { return new String[] {".sql"
										                                                    ,".trg"
																    ,".prc",".fnc"
																    ,".pld"
																    ,".pls",".plh",".plb"
																    ,".pck",".pks",".pkh",".pkb"
																    ,".typ",".tyb"
																    ,".tps",".tpb"
																    }; };	} },
=======
									public Language languageFor(LanguageFactory lf, Properties p) { return lf.createLanguage("cs"); }
									public String[] extensions() { return new String[] {".cs" }; };	} },
>>>>>>> d47e68e370e265f0ddeae78975e5daf816fbeb41
		};
	
	private static final int		DEFAULT_CPD_MINIMUM_LENGTH = 75;
Solution content 
									public Language languageFor(LanguageFactory lf, Properties p) { return lf.createLanguage("php"); }
									public String[] extensions() { return new String[] {".php" }; };	} },
		{"C#", 			    new LanguageConfig() {
									public Language languageFor(LanguageFactory lf, Properties p) { return lf.createLanguage("cs"); }
									public String[] extensions() { return new String[] {".cs" }; };	} },
		{"PLSQL", 			 new LanguageConfig() {
									public Language languageFor(LanguageFactory lf, Properties p) { return lf.createLanguage("plsql"); }
									public String[] extensions() { return new String[] {".sql"
																,".trg"
																,".prc",".fnc"
																,".pld"
																,".pls",".plh",".plb"
																,".pck",".pks",".pkh",".pkb"
																,".typ",".tyb"
																,".tps",".tpb"
																}; };	} },
		};
	
	private static final int		DEFAULT_CPD_MINIMUM_LENGTH = 75;
File
GUI.java
Developer's decision
Combination
Kind of conflict
Array initializer
Method declaration