Commit 2bb7dd9b authored by Stefan's avatar Stefan
Browse files

resolved merge conflict

parent 7e70ba94
# Fdb version 3 # Fdb version 3
["pdflatex"] 1533842880 "c:/Users/stefa/OneDrive/Stefan/Uni/DIY-G2/diy-project/beamer/Abschlusspraesentation.tex" "Abschlusspraesentation.pdf" "Abschlusspraesentation" 1533842945 ["pdflatex"] 1533843290 "c:/Users/stefa/OneDrive/Stefan/Uni/DIY-G2/diy-project/beamer/Abschlusspraesentation.tex" "Abschlusspraesentation.pdf" "Abschlusspraesentation" 1533843341
"Abschlusspraesentation.aux" 1533842938 7044 2d794e9027fd0e5affd914b3001bccd8 "" "Abschlusspraesentation.aux" 1533843338 7044 2d794e9027fd0e5affd914b3001bccd8 ""
"Abschlusspraesentation.nav" 1533842938 4041 7abd3d15f813bfa49fad6c557f385c0c "" "Abschlusspraesentation.nav" 1533843338 4041 7abd3d15f813bfa49fad6c557f385c0c ""
"Abschlusspraesentation.out" 1533842885 0 d41d8cd98f00b204e9800998ecf8427e "" "Abschlusspraesentation.out" 1533843297 0 d41d8cd98f00b204e9800998ecf8427e ""
"Abschlusspraesentation.tex" 1533842806 11562 7ccc0a613e36476eb10068a4fb17bcb7 "" "Abschlusspraesentation.tex" 1533843284 11476 055e7595a163881104af182fbed92221 ""
"Abschlusspraesentation.toc" 1533842938 629 3853779eb466af1eaf77df9a86909529 "" "Abschlusspraesentation.toc" 1533843338 629 3853779eb466af1eaf77df9a86909529 ""
"C:/Program Files/MiKTeX 2.9/fonts/tfm/public/amsfonts/cmextra/cmex7.tfm" 1233955448 1004 54797486969f23fa377b128694d548df "" "C:/Program Files/MiKTeX 2.9/fonts/tfm/public/amsfonts/cmextra/cmex7.tfm" 1233955448 1004 54797486969f23fa377b128694d548df ""
"C:/Program Files/MiKTeX 2.9/fonts/tfm/public/amsfonts/cmextra/cmex8.tfm" 1233955448 988 bdf658c3bfc2d96d3c8b02cfc1c94c20 "" "C:/Program Files/MiKTeX 2.9/fonts/tfm/public/amsfonts/cmextra/cmex8.tfm" 1233955448 988 bdf658c3bfc2d96d3c8b02cfc1c94c20 ""
"C:/Program Files/MiKTeX 2.9/fonts/tfm/public/amsfonts/symbols/msam10.tfm" 1233955454 916 f87d7c45f9c908e672703b83b72241a3 "" "C:/Program Files/MiKTeX 2.9/fonts/tfm/public/amsfonts/symbols/msam10.tfm" 1233955454 916 f87d7c45f9c908e672703b83b72241a3 ""
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
"C:/Users/stefa/AppData/Roaming/MiKTeX/2.9/tex/latex/beamer/beamerthemedefault.sty" 1516823996 355 75c98e7b8f427eb7c625ed391b140c5b "" "C:/Users/stefa/AppData/Roaming/MiKTeX/2.9/tex/latex/beamer/beamerthemedefault.sty" 1516823996 355 75c98e7b8f427eb7c625ed391b140c5b ""
"beamerthemei4.sty" 1533838080 7505 01cedf0a620aa3e79b5a9c33d39ba09e "" "beamerthemei4.sty" 1533838080 7505 01cedf0a620aa3e79b5a9c33d39ba09e ""
"beamerthemei4_bg.pdf" 1533838080 47710 7e20410193206e9b2143065118e25507 "" "beamerthemei4_bg.pdf" 1533838080 47710 7e20410193206e9b2143065118e25507 ""
"c:/Users/stefa/OneDrive/Stefan/Uni/DIY-G2/diy-project/beamer/Abschlusspraesentation.tex" 1533842806 11562 7ccc0a613e36476eb10068a4fb17bcb7 "" "c:/Users/stefa/OneDrive/Stefan/Uni/DIY-G2/diy-project/beamer/Abschlusspraesentation.tex" 1533843284 11476 055e7595a163881104af182fbed92221 ""
"img/Ablauf.png" 1533842799 5200 b22e5f358806464e8104e5ecd5ff1407 "" "img/Ablauf.png" 1533842799 5200 b22e5f358806464e8104e5ecd5ff1407 ""
"img/BoardCase.png" 1533838080 46465 3861e1eab7d6319f4b3870b6c5c45e39 "" "img/BoardCase.png" 1533838080 46465 3861e1eab7d6319f4b3870b6c5c45e39 ""
"img/Elektronik_Bild.jpg" 1533838080 803995 e6f881688f28db2d8aee5d0f51b6895c "" "img/Elektronik_Bild.jpg" 1533838080 803995 e6f881688f28db2d8aee5d0f51b6895c ""
...@@ -213,10 +213,10 @@ ...@@ -213,10 +213,10 @@
"img/korrigierter_Winkel_Pres.pdf" 1533838081 26549 2fe489004f20259d09793ff9b9465f98 "" "img/korrigierter_Winkel_Pres.pdf" 1533838081 26549 2fe489004f20259d09793ff9b9465f98 ""
"img/motoraufsatz1_oben.png" 1533838081 287156 7c435fd675a5ba249b80379222a4937a "" "img/motoraufsatz1_oben.png" 1533838081 287156 7c435fd675a5ba249b80379222a4937a ""
(generated) (generated)
"Abschlusspraesentation.aux"
"Abschlusspraesentation.log"
"Abschlusspraesentation.out"
"Abschlusspraesentation.toc"
"Abschlusspraesentation.snm" "Abschlusspraesentation.snm"
"Abschlusspraesentation.aux"
"Abschlusspraesentation.nav" "Abschlusspraesentation.nav"
"Abschlusspraesentation.pdf" "Abschlusspraesentation.pdf"
"Abschlusspraesentation.toc"
"Abschlusspraesentation.log"
"Abschlusspraesentation.out"
This is pdfTeX, Version 3.14159265-2.6-1.40.17 (MiKTeX 2.9.6210 64-bit) (preloaded format=pdflatex 2017.8.28) 9 AUG 2018 21:28 This is pdfTeX, Version 3.14159265-2.6-1.40.17 (MiKTeX 2.9.6210 64-bit) (preloaded format=pdflatex 2017.8.28) 9 AUG 2018 21:34
entering extended mode entering extended mode
**c:/Users/stefa/OneDrive/Stefan/Uni/DIY-G2/diy-project/beamer/Abschlusspraesen **c:/Users/stefa/OneDrive/Stefan/Uni/DIY-G2/diy-project/beamer/Abschlusspraesen
tation.tex tation.tex
...@@ -1415,7 +1415,7 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1415,7 +1415,7 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
<./img/Roboter_Front.png>] <./img/Roboter_Front.png>]
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 161. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 157.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1428,11 +1428,11 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1428,11 +1428,11 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
File: ./img/Robot-Schematic.pdf Graphic file (type pdf) File: ./img/Robot-Schematic.pdf Graphic file (type pdf)
<use ./img/Robot-Schematic.pdf> <use ./img/Robot-Schematic.pdf>
Package pdftex.def Info: ./img/Robot-Schematic.pdf used on input line 167. Package pdftex.def Info: ./img/Robot-Schematic.pdf used on input line 163.
(pdftex.def) Requested size: 317.91731pt x 138.66881pt. (pdftex.def) Requested size: 317.91731pt x 138.66881pt.
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 167. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 163.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1446,11 +1446,11 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1446,11 +1446,11 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
File: ./img/Elektronik_Bild.jpg Graphic file (type jpg) File: ./img/Elektronik_Bild.jpg Graphic file (type jpg)
<use ./img/Elektronik_Bild.jpg> <use ./img/Elektronik_Bild.jpg>
Package pdftex.def Info: ./img/Elektronik_Bild.jpg used on input line 171. Package pdftex.def Info: ./img/Elektronik_Bild.jpg used on input line 167.
(pdftex.def) Requested size: 317.91731pt x 178.89748pt. (pdftex.def) Requested size: 317.91731pt x 178.89748pt.
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 171. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 167.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1460,7 +1460,7 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1460,7 +1460,7 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
[11 [11
<./img/Elektronik_Bild.jpg>] <./img/Elektronik_Bild.jpg>]
Overfull \hbox (12.0pt too wide) in paragraph at lines 194--194 Overfull \hbox (12.0pt too wide) in paragraph at lines 190--190
[][]| [][]|
[] []
...@@ -1469,22 +1469,22 @@ File: ./img/Schaltplan_LED_Platine.pdf Graphic file (type pdf) ...@@ -1469,22 +1469,22 @@ File: ./img/Schaltplan_LED_Platine.pdf Graphic file (type pdf)
<use ./img/Schaltplan_LED_Platine.pdf> <use ./img/Schaltplan_LED_Platine.pdf>
Package pdftex.def Info: ./img/Schaltplan_LED_Platine.pdf used on input line 19 Package pdftex.def Info: ./img/Schaltplan_LED_Platine.pdf used on input line 19
4. 0.
(pdftex.def) Requested size: 158.95865pt x 124.80344pt. (pdftex.def) Requested size: 158.95865pt x 124.80344pt.
<./img/LED_Platine_Bild.jpg, id=156, 714.0276pt x 535.41745pt> <./img/LED_Platine_Bild.jpg, id=156, 714.0276pt x 535.41745pt>
File: ./img/LED_Platine_Bild.jpg Graphic file (type jpg) File: ./img/LED_Platine_Bild.jpg Graphic file (type jpg)
<use ./img/LED_Platine_Bild.jpg> <use ./img/LED_Platine_Bild.jpg>
Package pdftex.def Info: ./img/LED_Platine_Bild.jpg used on input line 194. Package pdftex.def Info: ./img/LED_Platine_Bild.jpg used on input line 190.
(pdftex.def) Requested size: 127.16498pt x 95.34975pt. (pdftex.def) Requested size: 127.16498pt x 95.34975pt.
Overfull \vbox (2.19308pt too high) detected at line 194 Overfull \vbox (2.19308pt too high) detected at line 190
[] []
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 194. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 190.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1494,18 +1494,18 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1494,18 +1494,18 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
[12 [12
<./img/Schaltplan_LED_Platine.pdf> <./img/LED_Platine_Bild.jpg>] <./img/Schaltplan_LED_Platine.pdf> <./img/LED_Platine_Bild.jpg>]
Overfull \hbox (12.0pt too wide) in paragraph at lines 223--223 Overfull \hbox (12.0pt too wide) in paragraph at lines 219--219
[][]| [][]|
[] []
Overfull \hbox (12.0pt too wide) in paragraph at lines 223--223 Overfull \hbox (12.0pt too wide) in paragraph at lines 219--219
[][] [][]
[] []
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 223. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 219.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1515,18 +1515,18 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1515,18 +1515,18 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
[13 [13
] ]
Overfull \hbox (12.0pt too wide) in paragraph at lines 249--249 Overfull \hbox (12.0pt too wide) in paragraph at lines 245--245
[][]| [][]|
[] []
Overfull \hbox (12.0pt too wide) in paragraph at lines 249--249 Overfull \hbox (12.0pt too wide) in paragraph at lines 245--245
[][] [][]
[] []
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 249. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 245.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1539,15 +1539,15 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1539,15 +1539,15 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
File: ./img/IIR_Filter_Acc_Pres.pdf Graphic file (type pdf) File: ./img/IIR_Filter_Acc_Pres.pdf Graphic file (type pdf)
<use ./img/IIR_Filter_Acc_Pres.pdf> <use ./img/IIR_Filter_Acc_Pres.pdf>
Package pdftex.def Info: ./img/IIR_Filter_Acc_Pres.pdf used on input line 253. Package pdftex.def Info: ./img/IIR_Filter_Acc_Pres.pdf used on input line 249.
(pdftex.def) Requested size: 295.66077pt x 221.74991pt. (pdftex.def) Requested size: 295.66077pt x 221.74991pt.
Overfull \vbox (2.78981pt too high) detected at line 253 Overfull \vbox (2.78981pt too high) detected at line 249
[] []
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 253. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 249.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1562,21 +1562,21 @@ File: ./img/Filter_Blockschaltbild.pdf Graphic file (type pdf) ...@@ -1562,21 +1562,21 @@ File: ./img/Filter_Blockschaltbild.pdf Graphic file (type pdf)
<use ./img/Filter_Blockschaltbild.pdf> <use ./img/Filter_Blockschaltbild.pdf>
Package pdftex.def Info: ./img/Filter_Blockschaltbild.pdf used on input line 26 Package pdftex.def Info: ./img/Filter_Blockschaltbild.pdf used on input line 26
9. 5.
(pdftex.def) Requested size: 302.02046pt x 67.74826pt. (pdftex.def) Requested size: 302.02046pt x 67.74826pt.
Overfull \hbox (12.0pt too wide) in paragraph at lines 269--269 Overfull \hbox (12.0pt too wide) in paragraph at lines 265--265
[][]| [][]|
[] []
Overfull \hbox (12.0pt too wide) in paragraph at lines 269--269 Overfull \hbox (12.0pt too wide) in paragraph at lines 265--265
[] []
[] []
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 269. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 265.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1591,15 +1591,15 @@ File: ./img/korrigierter_Winkel_Pres.pdf Graphic file (type pdf) ...@@ -1591,15 +1591,15 @@ File: ./img/korrigierter_Winkel_Pres.pdf Graphic file (type pdf)
<use ./img/korrigierter_Winkel_Pres.pdf> <use ./img/korrigierter_Winkel_Pres.pdf>
Package pdftex.def Info: ./img/korrigierter_Winkel_Pres.pdf used on input line Package pdftex.def Info: ./img/korrigierter_Winkel_Pres.pdf used on input line
273. 269.
(pdftex.def) Requested size: 295.66077pt x 221.74991pt. (pdftex.def) Requested size: 295.66077pt x 221.74991pt.
Overfull \vbox (2.78981pt too high) detected at line 273 Overfull \vbox (2.78981pt too high) detected at line 269
[] []
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 273. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 269.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1613,26 +1613,26 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1613,26 +1613,26 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
File: ./img/Strecke2.png Graphic file (type png) File: ./img/Strecke2.png Graphic file (type png)
<use ./img/Strecke2.png> <use ./img/Strecke2.png>
Package pdftex.def Info: ./img/Strecke2.png used on input line 302. Package pdftex.def Info: ./img/Strecke2.png used on input line 298.
(pdftex.def) Requested size: 71.13188pt x 105.6682pt. (pdftex.def) Requested size: 71.13188pt x 105.6682pt.
<./img/Strecke.png, id=242, 415.92891pt x 235.63031pt> <./img/Strecke.png, id=242, 415.92891pt x 235.63031pt>
File: ./img/Strecke.png Graphic file (type png) File: ./img/Strecke.png Graphic file (type png)
<use ./img/Strecke.png> <use ./img/Strecke.png>
Package pdftex.def Info: ./img/Strecke.png used on input line 302. Package pdftex.def Info: ./img/Strecke.png used on input line 298.
(pdftex.def) Requested size: 170.71652pt x 96.71332pt. (pdftex.def) Requested size: 170.71652pt x 96.71332pt.
Overfull \hbox (14.22638pt too wide) in paragraph at lines 302--302 Overfull \hbox (14.22638pt too wide) in paragraph at lines 298--298
[] []
[] []
Overfull \vbox (10.46867pt too high) detected at line 302 Overfull \vbox (10.46867pt too high) detected at line 298
[] []
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 302. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 298.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1646,16 +1646,16 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1646,16 +1646,16 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
File: ./img/Regelung.png Graphic file (type png) File: ./img/Regelung.png Graphic file (type png)
<use ./img/Regelung.png> <use ./img/Regelung.png>
Package pdftex.def Info: ./img/Regelung.png used on input line 317. Package pdftex.def Info: ./img/Regelung.png used on input line 313.
(pdftex.def) Requested size: 170.71652pt x 96.71332pt. (pdftex.def) Requested size: 170.71652pt x 96.71332pt.
Overfull \hbox (14.22638pt too wide) in paragraph at lines 317--317 Overfull \hbox (14.22638pt too wide) in paragraph at lines 313--313
[][] [][]
[] []
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 317. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 313.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1667,7 +1667,7 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1667,7 +1667,7 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
<./img/Regelung.png>] <./img/Regelung.png>]
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 339. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 335.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1679,7 +1679,7 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1679,7 +1679,7 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
] ]
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 365. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 361.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1691,12 +1691,12 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1691,12 +1691,12 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
] <./img/Ablauf.png, id=284, 180.675pt x 51.19125pt> ] <./img/Ablauf.png, id=284, 180.675pt x 51.19125pt>
File: ./img/Ablauf.png Graphic file (type png) File: ./img/Ablauf.png Graphic file (type png)
<use ./img/Ablauf.png> <use ./img/Ablauf.png>
Package pdftex.def Info: ./img/Ablauf.png used on input line 395. Package pdftex.def Info: ./img/Ablauf.png used on input line 391.
(pdftex.def) Requested size: 113.81102pt x 32.24673pt. (pdftex.def) Requested size: 113.81102pt x 32.24673pt.
File: beamerthemei4_bg.pdf Graphic file (type pdf) File: beamerthemei4_bg.pdf Graphic file (type pdf)
<use beamerthemei4_bg.pdf> <use beamerthemei4_bg.pdf>
Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 395. Package pdftex.def Info: beamerthemei4_bg.pdf used on input line 391.
(pdftex.def) Requested size: 364.19536pt x 273.0554pt. (pdftex.def) Requested size: 364.19536pt x 273.0554pt.
Overfull \hbox (2.83337pt too wide) has occurred while \output is active Overfull \hbox (2.83337pt too wide) has occurred while \output is active
...@@ -1715,11 +1715,11 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active ...@@ -1715,11 +1715,11 @@ Overfull \hbox (2.83337pt too wide) has occurred while \output is active
\tf@snm=\write8 \tf@snm=\write8
\openout8 = `Abschlusspraesentation.snm'. \openout8 = `Abschlusspraesentation.snm'.
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 399. Package atveryend Info: Empty hook `BeforeClearDocument' on input line 395.
Package atveryend Info: Empty hook `AfterLastShipout' on input line 399. Package atveryend Info: Empty hook `AfterLastShipout' on input line 395.
(Abschlusspraesentation.aux) (Abschlusspraesentation.aux)
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 399. Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 395.
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 399. Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 395.
Package rerunfilecheck Info: File `Abschlusspraesentation.out' has not changed. Package rerunfilecheck Info: File `Abschlusspraesentation.out' has not changed.
(rerunfilecheck) Checksum: D41D8CD98F00B204E9800998ECF8427E;0. (rerunfilecheck) Checksum: D41D8CD98F00B204E9800998ECF8427E;0.
...@@ -1736,7 +1736,7 @@ Here is how much of TeX's memory you used: ...@@ -1736,7 +1736,7 @@ Here is how much of TeX's memory you used:
ogram Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmss12.pfb><C:/Program Fi ogram Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmss12.pfb><C:/Program Fi
les/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmss17.pfb><C:/Program Files/MiKT les/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmss17.pfb><C:/Program Files/MiKT
eX 2.9/fonts/type1/public/amsfonts/cm/cmss8.pfb> eX 2.9/fonts/type1/public/amsfonts/cm/cmss8.pfb>
Output written on Abschlusspraesentation.pdf (22 pages, 15007008 bytes). Output written on Abschlusspraesentation.pdf (22 pages, 14981756 bytes).
PDF statistics: PDF statistics:
323 PDF objects out of 1000 (max. 8388607) 323 PDF objects out of 1000 (max. 8388607)
57 named destinations out of 1000 (max. 500000) 57 named destinations out of 1000 (max. 500000)
......
...@@ -131,11 +131,7 @@ ...@@ -131,11 +131,7 @@
\begin{frame}\frametitle{Kostenübersicht} \begin{frame}\frametitle{Kostenübersicht}
\begin{table} \begin{table}
<<<<<<< HEAD
\footnotesize \footnotesize
=======
%\footnotesize
>>>>>>> 144fd77d6f078eb48939218278bed167836458f0
\begin{tabular}{|c|c|c|}\hline \begin{tabular}{|c|c|c|}\hline
Bezeichnung&Anzahl&Preis (Euro)\\ \hline Bezeichnung&Anzahl&Preis (Euro)\\ \hline
......
Supports Markdown
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