Fix
This commit is contained in:
		@@ -14,11 +14,7 @@ class LogMaintainer
 | 
				
			|||||||
					unlink ($dir . $file);
 | 
										unlink ($dir . $file);
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
			} else {
 | 
								} else {
 | 
				
			||||||
<<<<<<< HEAD
 | 
					 | 
				
			||||||
				$this->cleaningDir ($dir . $file . "/", $seconds);
 | 
									$this->cleaningDir ($dir . $file . "/", $seconds);
 | 
				
			||||||
=======
 | 
					 | 
				
			||||||
				$this->cleaningDir ($path . $file . "/", $seconds);
 | 
					 | 
				
			||||||
>>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494
 | 
					 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
@@ -27,8 +23,4 @@ class LogMaintainer
 | 
				
			|||||||
		$seconds = $days * 86400;
 | 
							$seconds = $days * 86400;
 | 
				
			||||||
		$this->cleaningDir ('../logs/', $seconds);
 | 
							$this->cleaningDir ('../logs/', $seconds);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
<<<<<<< HEAD
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
=======
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
>>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user