Browse Source

[text edit] for rolanapt
[fixes] for above and stat_display having a line om a conflict in it.

KevinSmarts 6 years ago
parent
commit
ec0ff8a536
2 changed files with 273 additions and 278 deletions
  1. 273 277
      locations/rolanapt.qsrc
  2. 0 1
      locations/stat_display.qsrc

File diff suppressed because it is too large
+ 273 - 277
locations/rolanapt.qsrc


+ 0 - 1
locations/stat_display.qsrc

@@ -1329,4 +1329,3 @@ end
 
 --- stat_display ---------------------------------
 
->>>>>>> 48c11b415a2f0467c4e8bcf088acba01ca5cc362

Some files were not shown because too many files changed in this diff