Fixed merge issues.

2026-09-11 21:45:23 -04:00 · 2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
@@ -1,30 +1,30 @@
-/*
- Title:        resource_attribute.java
- Description:  resource attribute name->value pair
- */
-
-package script;
-
-
-public class resource_attribute
-{
-	private String m_name;
-	private int m_value;
-
-	public resource_attribute(String name, int value)
-	{
-		m_name = name;
-		m_value = value;
-	}
-
-	public String getName()
-	{
-		return m_name;
-	}
-
-	public int getValue()
-	{
-		return m_value;
-	}
-}
-
+/*
+ Title:        resource_attribute.java
+ Description:  resource attribute name->value pair
+ */
+
+package script;
+
+
+public class resource_attribute
+{
+	private String m_name;
+	private int m_value;
+
+	public resource_attribute(String name, int value)
+	{
+		m_name = name;
+		m_value = value;
+	}
+
+	public String getName()
+	{
+		return m_name;
+	}
+
+	public int getValue()
+	{
+		return m_value;
+	}
+}
+