Skip to content

Commit

Permalink
Fixed file errros #2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ScrappyCocco
ScrappyCocco committed Sep 10, 2017
1 parent 32dfe47 commit 76fabce
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion ItalianTranslation_PlanetCoaster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4049,7 +4049,6 @@
<entry key="BuildingPartName_HOL_Roof_Bread" translation="Pan di Zenzero Dorsale Tetto"/>
<entry key="BuildingPartName_HOL_Roof_Bread_02" translation="Pan di Zenzero Dorsale Tetto Stile Olandese"/>
<entry key="BuildingPartName_HOL_Roof_Bread_02_Overhang_1m" translation="Pan di Zenzero Dorsale Tetto Sporgente"/>
>>>>>>> a8a1e460351989ae5df1255ef812dbf3c966782e
<entry key="BuildingPartName_HOL_Roof_Bread_Flat" translation="Pan di Zenzero Tetto Piatto"/>
<entry key="BuildingPartName_HOL_Roof_Bread_FlatQtrCirc" translation="Pan di Zenzero Tetto Piatto a Quarto di Cerchio"/>
<entry key="BuildingPartName_HOL_Roof_Bread_Overhang_1m" translation="Pan di Zenzero Dorsale Tetto Sporgente"/>
Expand Down

3 comments on commit 76fabce

@RaydenMK
Copy link
Contributor

@RaydenMK RaydenMK commented on 76fabce Sep 10, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ci deve essere stato qualche problema con i merge.. facendo il "compare" con il mio file in locale (utilizzato notepad ++ come mi hai detto), nel tuo risultano diverse aree duplicate e un sacco di righe saltate..
Se vuoi l'uploado nella mia beta e verifichi.

@ScrappyCocco
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Infatti è pieno di duplicati (non so causati da chi), sto rimuovendo e correggendo, entro le 16 troverai un nuovo branch beta senza duplicati nè altro (in teoria)

@ScrappyCocco
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dovrei aver fatto

Please sign in to comment.