Commit 156a1ec1 authored by root's avatar root

fix backup

parent 7afcf3fc
......@@ -124,13 +124,8 @@ DROP TABLE IF EXISTS `valeur`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `valeur` (
`id` int(11) NOT NULL AUTO_INCREMENT,
<<<<<<< HEAD
`temps` datetime(6) NOT NULL,
`valeur` varchar(20) DEFAULT NULL,
=======
`temps` datetime NOT NULL,
`valeur` varchar(30) DEFAULT NULL,
>>>>>>> 9dffffe72bda7634755e608b0d679d05826b381b
`idCapteur` int(11) NOT NULL,
PRIMARY KEY (`id`),
KEY `idCapteur` (`idCapteur`),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment