Image.java: resolve a javadoc error caused by a merge conflict

stephengold · stephengold · commit ccecc94a7845 · 2021-04-11T15:01:06.000-07:00
diff --git a/jme3-core/src/main/java/com/jme3/texture/Image.java b/jme3-core/src/main/java/com/jme3/texture/Image.java
@@ -960,7 +960,7 @@ public void setData(int index, ByteBuffer data) {
     }
 
     /**
-     * @param efficientData ignored
+     * @return null
      * @deprecated This feature is no longer used by the engine
      */
     @Deprecated

Original file line number	Diff line number	Diff line change
`@@ -960,7 +960,7 @@ public void setData(int index, ByteBuffer data) {`
`960`	`960`	`}`
`961`	`961`
`962`	`962`	`/**`
`963`		`- * @param efficientData ignored`
	`963`	`+ * @return null`
`964`	`964`	`* @deprecated This feature is no longer used by the engine`
`965`	`965`	`*/`
`966`	`966`	`@Deprecated`