fix merge issue

Heliozoa · Heliozoa · commit bb74028185ff · 2021-05-26T14:53:01.000+03:00
diff --git a/tmc-langs/src/lib.rs b/tmc-langs/src/lib.rs
@@ -876,7 +876,7 @@ pub fn prepare_stub(exercise_path: &Path, dest_path: &Path) -> Result<(), LangsE
     submission_processing::prepare_stub(&exercise_path, dest_path)?;
 
     // The Ant plugin needs some additional files to be copied over.
-    if let PluginType::Ant = tmc_langs_plugins::get_language_plugin_type(exercise_path)? {
+    if let Some(PluginType::Ant) = tmc_langs_plugins::get_language_plugin_type(exercise_path) {
         AntPlugin::copy_tmc_junit_runner(dest_path).map_err(|e| TmcError::Plugin(Box::new(e)))?;
     }
     Ok(())

Original file line number	Diff line number	Diff line change
`@@ -876,7 +876,7 @@ pub fn prepare_stub(exercise_path: &Path, dest_path: &Path) -> Result<(), LangsE`
`876`	`876`	`submission_processing::prepare_stub(&exercise_path, dest_path)?;`
`877`	`877`
`878`	`878`	`// The Ant plugin needs some additional files to be copied over.`
`879`		`- if let PluginType::Ant = tmc_langs_plugins::get_language_plugin_type(exercise_path)? {`
	`879`	`+ if let Some(PluginType::Ant) = tmc_langs_plugins::get_language_plugin_type(exercise_path) {`
`880`	`880`	`AntPlugin::copy_tmc_junit_runner(dest_path).map_err(\|e\| TmcError::Plugin(Box::new(e)))?;`
`881`	`881`	`}`
`882`	`882`	`Ok(())`