Merge pull request #3 akasima-pr-sender/develop-test1 closed

* akasima-pr-sender-develop-test1: #3 i ahaha allll
akasima · Jul 2, 2014 · f8d44ab · f8d44ab
2 parents b42ca20 + 8221615
commit f8d44ab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
@@ -33,6 +33,7 @@ function init()
 	{
 		$a = 1;
 		$b = 1;
+$c = 4;
 
 		$this->addSome = new stdClass;
 

diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
@@ -12,6 +12,10 @@ class fileAdminView extends file
 	 */
 	function init()
 	{
+$a = 1;
+$b = 2;
+$c = 3;
+$d = 1;
 	}
 
 	/**

diff --git a/modules/file/file.view.php b/modules/file/file.view.php
@@ -12,6 +12,8 @@ class fileView extends file
 	 */
 	function init()
 	{
+$a = 1;
+$b =2;
 	}
 
 	/**

diff --git a/modules/module/module.view.php b/modules/module/module.view.php
@@ -14,6 +14,7 @@ function init()
 	{
 		// Set the template path
 		$this->setTemplatePath($this->module_path.'tpl');
+$a =3;
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ function init() @@
     	{
     		$a = 1;
     		$b = 1;
+    $c = 4;
     		$this->addSome = new stdClass;
@@ Expand Down @@