revert gitignore and remove conf.xml and control_panel.xml symlink

This commit is contained in:
Gautier Hattenberger
2017-05-30 23:27:00 +02:00
parent 9fb9d310e0
commit c30dbc73b0
3 changed files with 2 additions and 4 deletions
+2 -2
View File
@@ -56,10 +56,10 @@ paparazzi.sublime-workspace
/paparazzi /paparazzi
# /conf/ # /conf/
/conf/conf.xml~ /conf/conf.xml
/conf/conf.xml.20* /conf/conf.xml.20*
/conf/conf_personal.xml.20* /conf/conf_personal.xml.20*
/conf/control_panel.xml~ /conf/control_panel.xml
/conf/control_panel.xml.20* /conf/control_panel.xml.20*
/conf/%gconf.xml /conf/%gconf.xml
/conf/maps_data/* /conf/maps_data/*
-1
View File
@@ -1 +0,0 @@
userconf/OPENUAS/openuas_conf.xml
-1
View File
@@ -1 +0,0 @@
userconf/OPENUAS/openuas_control_panel.xml