Fix BLM Page

Murakumo-JP · Jul 17, 2024 · 9ddc703 · 9ddc703
1 parent cc0fdee
commit 9ddc703
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Page/BLM.html b/Page/BLM.html
@@ -579,13 +579,8 @@ <h3 class="job_sub_title" id="anchor_pvp_commononlyaction">Общие умени
       </div>
       <!--- Script --->
       <script type="text/javascript" src="../Assets/js/db.js?v2"></script>
-<<<<<<< Updated upstream
       <script type="text/javascript" src="../DB/BlackMage.js?29062024"></script>
       <script type="text/javascript" src="../DB/RoleActions.js?11072024"></script>
-=======
-      <script type="text/javascript" src="../DB/BlackMage.js?16072024"></script>
-      <script type="text/javascript" src="../DB/RoleActions.js?01072024"></script>
->>>>>>> Stashed changes
       <script type="text/javascript" src="../Assets/js/main.js"></script>
       <script src="https://lds-img.finalfantasyxiv.com/pc/global/js/eorzeadb/loader.js?v3"></script>
    </body>